diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-10-11 15:07:03 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-10-11 15:07:03 +0000 |
| commit | 924bd79e317e9a137c0d1b9d349185758a628ec4 (patch) | |
| tree | f877c8b19e53e7d0a7683e3dd9aeb713146c4a8f /src/os/unix/ngx_solaris_config.h | |
| parent | aef13d7f6660f4f8d2c50c95b8e182e62c115f88 (diff) | |
| download | nginx-924bd79e317e9a137c0d1b9d349185758a628ec4.tar.gz nginx-924bd79e317e9a137c0d1b9d349185758a628ec4.zip | |
nginx-0.1.1-RELEASE importrelease-0.1.1
*) Feature: the gzip_types directive.
*) Feature: the tcp_nodelay directive.
*) Feature: the send_lowat directive is working not only on OSes that
support kqueue NOTE_LOWAT, but also on OSes that support SO_SNDLOWAT.
*) Feature: the setproctitle() emulation for Linux and Solaris.
*) Bugfix: the "Location" header rewrite bug fixed while the proxying.
*) Bugfix: the ngx_http_chunked_module module may get caught in an
endless loop.
*) Bugfix: the /dev/poll module bugs fixed.
*) Bugfix: the responses were corrupted when the temporary files were
used while the proxying.
*) Bugfix: the unescaped requests were passed to the backend.
*) Bugfix: while the build configuration on Linux 2.4 the
--with-poll_module parameter was required.
Diffstat (limited to 'src/os/unix/ngx_solaris_config.h')
| -rw-r--r-- | src/os/unix/ngx_solaris_config.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/os/unix/ngx_solaris_config.h b/src/os/unix/ngx_solaris_config.h index 6cbfcc2ec..96c119cab 100644 --- a/src/os/unix/ngx_solaris_config.h +++ b/src/os/unix/ngx_solaris_config.h @@ -40,10 +40,10 @@ #include <sys/socket.h> #include <netinet/in.h> +#include <netinet/tcp.h> /* TCP_NODELAY */ #include <arpa/inet.h> #include <netdb.h> -#include <sys/sendfile.h> #include <sys/systeminfo.h> #include <limits.h> /* IOV_MAX */ #include <inttypes.h> @@ -64,6 +64,11 @@ #endif +#if (HAVE_SENDFILE) +#include <sys/sendfile.h> +#endif + + #if (HAVE_AIO) #include <aio.h> #endif @@ -80,7 +85,16 @@ #endif -#define ngx_setproctitle(title) +#ifndef HAVE_SO_SNDLOWAT +/* setsockopt(SO_SNDLOWAT) returns error "Option not supported by protocol" */ +#define HAVE_SO_SNDLOWAT 0 +#endif + + +#ifndef NGX_SETPROCTITLE_USES_ENV +#define NGX_SETPROCTITLE_USES_ENV 1 +#define NGX_SETPROCTITLE_PAD ' ' +#endif #endif /* _NGX_SOLARIS_CONFIG_H_INCLUDED_ */ |