diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-01-11 15:26:57 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-01-11 15:26:57 +0000 |
| commit | df3254aa49c80b350ff4fa2eb50baf3cafbed71c (patch) | |
| tree | 15a72baf5205f698354f529e4ba2d5846b558c4a /src/os/unix | |
| parent | 04ebcd942969bc479b4cc680eab6bf01f488f12f (diff) | |
| download | nginx-release-0.3.20.tar.gz nginx-release-0.3.20.zip | |
nginx-0.3.20-RELEASE importrelease-0.3.20
*) Bugfix: in SSI handling.
*) Bugfix: the ngx_http_memcached_module did not support the keys in
the "/usr?args" form.
Diffstat (limited to 'src/os/unix')
| -rw-r--r-- | src/os/unix/ngx_freebsd_sendfile_chain.c | 9 | ||||
| -rw-r--r-- | src/os/unix/ngx_linux_sendfile_chain.c | 6 | ||||
| -rw-r--r-- | src/os/unix/ngx_solaris_sendfilev_chain.c | 7 | ||||
| -rw-r--r-- | src/os/unix/ngx_writev_chain.c | 6 |
4 files changed, 23 insertions, 5 deletions
diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c index 7ae594897..97f968c40 100644 --- a/src/os/unix/ngx_freebsd_sendfile_chain.c +++ b/src/os/unix/ngx_freebsd_sendfile_chain.c @@ -28,8 +28,13 @@ */ -#define NGX_HEADERS 8 -#define NGX_TRAILERS 8 +#if (IOV_MAX > 64) +#define NGX_HEADERS 64 +#define NGX_TRAILERS 64 +#else +#define NGX_HEADERS IOV_MAX +#define NGX_TRAILERS IOV_MAX +#endif ngx_chain_t * diff --git a/src/os/unix/ngx_linux_sendfile_chain.c b/src/os/unix/ngx_linux_sendfile_chain.c index 225f9e1ec..fb9957728 100644 --- a/src/os/unix/ngx_linux_sendfile_chain.c +++ b/src/os/unix/ngx_linux_sendfile_chain.c @@ -20,7 +20,11 @@ */ -#define NGX_HEADERS 8 +#if (IOV_MAX > 64) +#define NGX_HEADERS 64 +#else +#define NGX_HEADERS IOV_MAX +#endif ngx_chain_t * diff --git a/src/os/unix/ngx_solaris_sendfilev_chain.c b/src/os/unix/ngx_solaris_sendfilev_chain.c index 1ed7239c2..ebccae8fa 100644 --- a/src/os/unix/ngx_solaris_sendfilev_chain.c +++ b/src/os/unix/ngx_solaris_sendfilev_chain.c @@ -31,7 +31,12 @@ static ssize_t sendfilev(int fd, const struct sendfilevec *vec, #endif -#define NGX_SENDFILEVECS 16 +#if (IOV_MAX > 64) +#define NGX_SENDFILEVECS 64 +#else +#define NGX_SENDFILEVECS IOV_MAX +#endif + ngx_chain_t * diff --git a/src/os/unix/ngx_writev_chain.c b/src/os/unix/ngx_writev_chain.c index f95c2cad8..c8eb48269 100644 --- a/src/os/unix/ngx_writev_chain.c +++ b/src/os/unix/ngx_writev_chain.c @@ -9,7 +9,11 @@ #include <ngx_event.h> -#define NGX_IOVS 16 +#if (IOV_MAX > 64) +#define NGX_IOVS 64 +#else +#define NGX_IOVS IOV_MAX +#endif ngx_chain_t * |