nginx-0.1.36-RELEASE import

    *) Change: if the request header has duplicate the "Host",
       "Connection", "Content-Length", or "Authorization" lines, then nginx
       now returns the 400 error.

    *) Change: the "post_accept_timeout" directive was canceled.

    *) Feature: the "default", "af=", "bl=", "deferred", and "bind"
       parameters of the "listen" directive.

    *) Feature: the FreeBSD accept filters support.

    *) Feature: the Linux TCP_DEFER_ACCEPT support.

    *) Bugfix: the ngx_http_autoindex_module did not support the file names
       in UTF-8.

    *) Bugfix: the new log file can be rotated by the -USR1 signal only if
       the reconfiguration by the -HUP signal was made twice.

1 files changed, 2 insertions, 2 deletions

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 441fd0cf..ffe1bf62 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -16,9 +16,9 @@ http {
     default_type  application/octet-stream;
 
     sendfile        on;
-    # tcp_nodelay   on;
+    #tcp_nodelay    on;
 
-    # keepalive_timeout  0;
+    #keepalive_timeout  0;
 
     #gzip  on;