diff options
| author | Diego Nehab <diego.nehab@gmail.com> | 2014-10-27 16:30:48 -0200 |
|---|---|---|
| committer | Diego Nehab <diego.nehab@gmail.com> | 2014-10-27 16:30:48 -0200 |
| commit | 6dcecd8f45fd3d0143b33548553c1d1f7dabc0b0 (patch) | |
| tree | a11ff415d738fa62e8abc6c25c64ac7d758e7128 /src | |
| parent | d80bb0d82ba105c8fdb27e6174c267965d06ffb0 (diff) | |
| parent | 4f122e60b147107a0a5ca7a8dff698a47794e30c (diff) | |
| download | luasocket-6dcecd8f45fd3d0143b33548553c1d1f7dabc0b0.tar.gz luasocket-6dcecd8f45fd3d0143b33548553c1d1f7dabc0b0.tar.bz2 luasocket-6dcecd8f45fd3d0143b33548553c1d1f7dabc0b0.zip | |
Merge pull request #108 from daurnimator/master
src/usocket: Do not setblocking on destroy, shutdown, and listen.
Diffstat (limited to 'src')
| -rw-r--r-- | src/usocket.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/usocket.c b/src/usocket.c index 096ecd0..89f774d 100644 --- a/src/usocket.c +++ b/src/usocket.c | |||
| @@ -92,7 +92,6 @@ int socket_close(void) { | |||
| 92 | \*-------------------------------------------------------------------------*/ | 92 | \*-------------------------------------------------------------------------*/ |
| 93 | void socket_destroy(p_socket ps) { | 93 | void socket_destroy(p_socket ps) { |
| 94 | if (*ps != SOCKET_INVALID) { | 94 | if (*ps != SOCKET_INVALID) { |
| 95 | socket_setblocking(ps); | ||
| 96 | close(*ps); | 95 | close(*ps); |
| 97 | *ps = SOCKET_INVALID; | 96 | *ps = SOCKET_INVALID; |
| 98 | } | 97 | } |
| @@ -140,9 +139,7 @@ int socket_bind(p_socket ps, SA *addr, socklen_t len) { | |||
| 140 | \*-------------------------------------------------------------------------*/ | 139 | \*-------------------------------------------------------------------------*/ |
| 141 | int socket_listen(p_socket ps, int backlog) { | 140 | int socket_listen(p_socket ps, int backlog) { |
| 142 | int err = IO_DONE; | 141 | int err = IO_DONE; |
| 143 | socket_setblocking(ps); | ||
| 144 | if (listen(*ps, backlog)) err = errno; | 142 | if (listen(*ps, backlog)) err = errno; |
| 145 | socket_setnonblocking(ps); | ||
| 146 | return err; | 143 | return err; |
| 147 | } | 144 | } |
| 148 | 145 | ||
| @@ -150,9 +147,7 @@ int socket_listen(p_socket ps, int backlog) { | |||
| 150 | * | 147 | * |
| 151 | \*-------------------------------------------------------------------------*/ | 148 | \*-------------------------------------------------------------------------*/ |
| 152 | void socket_shutdown(p_socket ps, int how) { | 149 | void socket_shutdown(p_socket ps, int how) { |
| 153 | socket_setblocking(ps); | ||
| 154 | shutdown(*ps, how); | 150 | shutdown(*ps, how); |
| 155 | socket_setnonblocking(ps); | ||
| 156 | } | 151 | } |
| 157 | 152 | ||
| 158 | /*-------------------------------------------------------------------------*\ | 153 | /*-------------------------------------------------------------------------*\ |
