diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-05-04 15:32:46 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-05-04 15:32:46 +0000 |
| commit | ac72bd17d1c845b81aa9d1050b764ba1018ae462 (patch) | |
| tree | e7df03607b73b7c1cca5438fa02b6022c0e37e74 /src/os/unix | |
| parent | 2cca46c774157b529c439eafe0083d75e74f138a (diff) | |
| download | nginx-ac72bd17d1c845b81aa9d1050b764ba1018ae462.tar.gz nginx-ac72bd17d1c845b81aa9d1050b764ba1018ae462.zip | |
nginx-0.3.44-RELEASE importrelease-0.3.44
*) Feature: the "wait" parameter in the "include" SSI command.
*) Feature: the Ukrainian and Byelorussian characters were added to
koi-win conversion table.
*) Bugfix: in the SSI.
Diffstat (limited to 'src/os/unix')
| -rw-r--r-- | src/os/unix/ngx_socket.c | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_socket.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/os/unix/ngx_socket.c b/src/os/unix/ngx_socket.c index 60885ddd5..a93679f64 100644 --- a/src/os/unix/ngx_socket.c +++ b/src/os/unix/ngx_socket.c @@ -10,7 +10,7 @@ /* * ioctl(FIONBIO) sets a blocking mode with the single syscall - * while fcntl(F_SETFL, ~O_NONBLOCK) needs to learn before + * while fcntl(F_SETFL, !O_NONBLOCK) needs to learn before * the previous state using fcntl(F_GETFL). * * ioctl() and fcntl() are syscalls at least in FreeBSD 2.x, Linux 2.2 diff --git a/src/os/unix/ngx_socket.h b/src/os/unix/ngx_socket.h index b381967e6..9e6a859bb 100644 --- a/src/os/unix/ngx_socket.h +++ b/src/os/unix/ngx_socket.h @@ -29,9 +29,12 @@ int ngx_blocking(ngx_socket_t s); #else -#define ngx_nonblocking(s) fcntl(s, F_SETFL, O_NONBLOCK) +#define ngx_nonblocking(s) fcntl(s, F_SETFL, fcntl(s, F_GETFL) | O_NONBLOCK) #define ngx_nonblocking_n "fcntl(O_NONBLOCK)" +#define ngx_blocking(s) fcntl(s, F_SETFL, fcntl(s, F_GETFL) & ~O_NONBLOCK) +#define ngx_blocking_n "fcntl(!O_NONBLOCK)" + #endif int ngx_tcp_nopush(ngx_socket_t s); |