diff options
author | Igor Sysoev <igor@sysoev.ru> | 2004-12-06 14:45:08 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2004-12-06 14:45:08 +0000 |
commit | 6a12fc91b0090b5628dc70d4a45db576c5b0c64a (patch) | |
tree | f473f81772c058b7488ac4030c3ff09994c6c532 /src/os/unix | |
parent | c372e09ab34ec8c4f60f8c08ef30b297c0e475ab (diff) | |
download | nginx-6a12fc91b0090b5628dc70d4a45db576c5b0c64a.tar.gz nginx-6a12fc91b0090b5628dc70d4a45db576c5b0c64a.zip |
nginx-0.1.12-RELEASE importrelease-0.1.12
*) Feature: the %request_length log parameter.
*) Bugfix: when using the /dev/poll, select and poll on the platforms,
where these methods may do the false reports, there may be the long
delay when the request was passed via the keep-alive connection. It
may be at least on Solaris when using the /dev/poll.
*) Bugfix: the send_lowat directive is ignored on Linux because Linux
does not support the SO_SNDLOWAT option.
Diffstat (limited to 'src/os/unix')
-rw-r--r-- | src/os/unix/ngx_linux_config.h | 6 | ||||
-rw-r--r-- | src/os/unix/ngx_solaris_config.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h index 84eaf5c6a..bb08f41e3 100644 --- a/src/os/unix/ngx_linux_config.h +++ b/src/os/unix/ngx_linux_config.h @@ -80,6 +80,12 @@ extern ssize_t sendfile(int s, int fd, int32_t *offset, size_t size); #endif +#ifndef NGX_HAVE_SO_SNDLOWAT +/* setsockopt(SO_SNDLOWAT) returns ENOPROTOOPT */ +#define NGX_HAVE_SO_SNDLOWAT 0 +#endif + + #ifndef NGX_HAVE_INHERITED_NONBLOCK #define NGX_HAVE_INHERITED_NONBLOCK 0 #endif diff --git a/src/os/unix/ngx_solaris_config.h b/src/os/unix/ngx_solaris_config.h index 452850c0f..e387006da 100644 --- a/src/os/unix/ngx_solaris_config.h +++ b/src/os/unix/ngx_solaris_config.h @@ -76,7 +76,7 @@ #ifndef NGX_HAVE_SO_SNDLOWAT -/* setsockopt(SO_SNDLOWAT) returns error "Option not supported by protocol" */ +/* setsockopt(SO_SNDLOWAT) returns ENOPROTOOPT */ #define NGX_HAVE_SO_SNDLOWAT 0 #endif |