remove never used zero copy stuff

diff --git a/src/core/ngx_buf.c b/src/core/ngx_buf.c
index 31d990315ac115d51a2bae79e2ba084b0685b4d9..2f2c4372185d0f549ef5254be4418491777589fa 100644 (file)
--- a/src/core/ngx_buf.c
+++ b/src/core/ngx_buf.c
@@ -201,12 +201,6 @@ ngx_chain_update_chains(ngx_chain_t **free, ngx_chain_t **busy,
             break;
         }
 
-#if (NGX_HAVE_WRITE_ZEROCOPY)
-        if ((*busy)->buf->zerocopy_busy) {
-            break;
-        }
-#endif
-
         if ((*busy)->buf->tag != tag) {
             *busy = (*busy)->next;
             continue;

diff --git a/src/core/ngx_buf.h b/src/core/ngx_buf.h
index ce26c630e17f9a3ee2fe4c0e2aff146e21623b56..8649bdb9e310c63ca8b8e810d047f863ba82f9fe 100644 (file)
--- a/src/core/ngx_buf.h
+++ b/src/core/ngx_buf.h
@@ -51,8 +51,6 @@ struct ngx_buf_s {
     unsigned         last_shadow:1;
     unsigned         temp_file:1;
 
-    unsigned         zerocopy_busy:1;
-
     /* STUB */ int   num;
 };
 

diff --git a/src/core/ngx_palloc.h b/src/core/ngx_palloc.h
index 434f9728b753addeb2d7b6aaaebf8742415849ac..c31db932c5c670f5cd915684fedbc46064bf3bd4 100644 (file)
--- a/src/core/ngx_palloc.h
+++ b/src/core/ngx_palloc.h
@@ -14,7 +14,6 @@
 
 /*
  * NGX_MAX_ALLOC_FROM_POOL should be (ngx_pagesize - 1), i.e. 4095 on x86.
- * On FreeBSD 5.x it allows to use the zero copy sending.
  * On Windows NT it decreases a number of locked pages in a kernel.
  */
 #define NGX_MAX_ALLOC_FROM_POOL  (ngx_pagesize - 1)

diff --git a/src/http/modules/ngx_http_charset_filter_module.c b/src/http/modules/ngx_http_charset_filter_module.c
index 16b61689d80e13f3321dd4a272352981d7d9555f..114542aedb00dfda44ba12f7242e2919748bbc36 100644 (file)
--- a/src/http/modules/ngx_http_charset_filter_module.c
+++ b/src/http/modules/ngx_http_charset_filter_module.c
@@ -541,12 +541,6 @@ ngx_http_charset_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
                 break;
             }
 
-#if (NGX_HAVE_WRITE_ZEROCOPY)
-            if (b->zerocopy_busy) {
-                break;
-            }
-#endif
-
             ctx->busy = cl->next;
 
             if (b->tag != (ngx_buf_tag_t) &ngx_http_charset_filter_module) {

diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index 61c95929dbac603bac0bbd7cfb8f5b2067ab8a6c..74a2c85d03bdb532946d4299ff4442c46393d895 100644 (file)
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -935,12 +935,6 @@ ngx_http_ssi_output(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx)
             break;
         }
 
-#if (NGX_HAVE_WRITE_ZEROCOPY)
-        if (b->zerocopy_busy) {
-            break;
-        }
-#endif
-
         if (b->shadow) {
             b->shadow->pos = b->shadow->last;
         }

diff --git a/src/http/modules/ngx_http_sub_filter_module.c b/src/http/modules/ngx_http_sub_filter_module.c
index f40a3c654a01d42f810255f9079f294d4fe1f51f..1cec8b63311f85a2f366add92c05743d7f9a5c51 100644 (file)
--- a/src/http/modules/ngx_http_sub_filter_module.c
+++ b/src/http/modules/ngx_http_sub_filter_module.c
@@ -465,12 +465,6 @@ ngx_http_sub_output(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx)
             break;
         }
 
-#if (NGX_HAVE_WRITE_ZEROCOPY)
-        if (b->zerocopy_busy) {
-            break;
-        }
-#endif
-
         if (b->shadow) {
             b->shadow->pos = b->shadow->last;
         }

diff --git a/src/os/unix/ngx_freebsd.h b/src/os/unix/ngx_freebsd.h
index c3be2bcfca820dc9ad9f0b247e8f0629ecc77d86..67fce3eb7ba1b76163b7db2b4328fd1e06ccf60b 100644 (file)
--- a/src/os/unix/ngx_freebsd.h
+++ b/src/os/unix/ngx_freebsd.h
@@ -14,7 +14,6 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
 extern int         ngx_freebsd_kern_osreldate;
 extern int         ngx_freebsd_hw_ncpu;
 extern u_long      ngx_freebsd_net_inet_tcp_sendspace;
-extern int         ngx_freebsd_kern_ipc_zero_copy_send;
 
 extern ngx_uint_t  ngx_freebsd_sendfile_nbytes_bug;
 extern ngx_uint_t  ngx_freebsd_use_tcp_nopush;

diff --git a/src/os/unix/ngx_freebsd_init.c b/src/os/unix/ngx_freebsd_init.c
index a2b4c57317954d8df4afdc573bb83bf92a79f21e..1211c7ccb742781923de4109f7f6a20c7c9e25ac 100644 (file)
--- a/src/os/unix/ngx_freebsd_init.c
+++ b/src/os/unix/ngx_freebsd_init.c
@@ -19,9 +19,6 @@ u_long  ngx_freebsd_net_inet_tcp_sendspace;
 /* FreeBSD 4.9 */
 int     ngx_freebsd_machdep_hlt_logical_cpus;
 
-/* FreeBSD 5.0 */
-int     ngx_freebsd_kern_ipc_zero_copy_send;
-
 
 ngx_uint_t  ngx_freebsd_sendfile_nbytes_bug;
 ngx_uint_t  ngx_freebsd_use_tcp_nopush;
@@ -68,10 +65,6 @@ sysctl_t sysctls[] = {
       &ngx_freebsd_kern_ipc_somaxconn,
       sizeof(ngx_freebsd_kern_ipc_somaxconn), 0 },
 
-    { "kern.ipc.zero_copy.send",
-      &ngx_freebsd_kern_ipc_zero_copy_send,
-      sizeof(ngx_freebsd_kern_ipc_zero_copy_send), 0 },
-
     { NULL, NULL, 0, 0 }
 };
 

diff --git a/src/os/unix/ngx_os.h b/src/os/unix/ngx_os.h
index 44ed6d0f19b18265ebe41e5bad9e65189ff46346..0dbdd0b3b23fcb716c14277001e78ded357e554f 100644 (file)
--- a/src/os/unix/ngx_os.h
+++ b/src/os/unix/ngx_os.h
@@ -13,7 +13,6 @@
 
 
 #define NGX_IO_SENDFILE    1
-#define NGX_IO_ZEROCOPY    2
 
 
 typedef ssize_t (*ngx_recv_pt)(ngx_connection_t *c, u_char *buf, size_t size);

diff --git a/src/os/win32/ngx_os.h b/src/os/win32/ngx_os.h
index c9a911a75a7d7ba0db7d3043d8ca218d21554b5e..93ec3ffaae0f93e87f30591bdd4e5e77de97c862 100644 (file)
--- a/src/os/win32/ngx_os.h
+++ b/src/os/win32/ngx_os.h
@@ -13,7 +13,6 @@
 #include <ngx_gui.h>
 
 #define NGX_IO_SENDFILE    1
-#define NGX_IO_ZEROCOPY    2
 
 
 typedef ssize_t (*ngx_recv_pt)(ngx_connection_t *c, u_char *buf, size_t size);