From df3254aa49c80b350ff4fa2eb50baf3cafbed71c Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Wed, 11 Jan 2006 15:26:57 +0000
Subject: nginx-0.3.20-RELEASE import

    *) Bugfix: in SSI handling.

    *) Bugfix: the ngx_http_memcached_module did not support the keys in
       the "/usr?args" form.
---
 src/os/unix/ngx_freebsd_sendfile_chain.c  | 9 +++++++--
 src/os/unix/ngx_linux_sendfile_chain.c    | 6 +++++-
 src/os/unix/ngx_solaris_sendfilev_chain.c | 7 ++++++-
 src/os/unix/ngx_writev_chain.c            | 6 +++++-
 4 files changed, 23 insertions(+), 5 deletions(-)

(limited to 'src/os/unix')

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 *
-- 
cgit