commit d039a2e193c9172e4f415b9304222e81804a69d0
author Igor Sysoev <igor@sysoev.ru> Tue Feb 22 14:40:13 2005 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Feb 22 14:40:13 2005 +0000
tree 4571d4da7950e9464e788a4d68dc5111167de52c
parent 174db74f2309e28c0e2b54e89b9e08afff187c7c

nginx-0.1.21-RELEASE import

    *) Bugfix: the ngx_http_stub_status_module showed incorrect statistics
       if "rtsig" method was used or if several worker process ran on SMP.

    *) Bugfix: nginx could not be built by the icc compiler on Linux or if
       the zlib-1.2.x library was building from sources.

    *) Bugfix: nginx could not be built on NetBSD 2.0.

conf/nginx.conf

diff --git a/conf/nginx.conf b/conf/nginx.conf
index d482550..441fd0c 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -15,7 +15,10 @@
     include       conf/mime.types;
     default_type  application/octet-stream;
 
-    sendfile  on;
+    sendfile        on;
+    # tcp_nodelay   on;
+
+    # keepalive_timeout  0;
 
     #gzip  on;