commit ac72bd17d1c845b81aa9d1050b764ba1018ae462
author Igor Sysoev <igor@sysoev.ru> Thu May 04 15:32:46 2006 +0000
committer Igor Sysoev <igor@sysoev.ru> Thu May 04 15:32:46 2006 +0000
tree e7df03607b73b7c1cca5438fa02b6022c0e37e74
parent 2cca46c774157b529c439eafe0083d75e74f138a

nginx-0.3.44-RELEASE import

    *) Feature: the "wait" parameter in the "include" SSI command.

    *) Feature: the Ukrainian and Byelorussian characters were added to
       koi-win conversion table.

    *) Bugfix: in the SSI.

conf/nginx.conf

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 11404ad..2f5785a 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -26,9 +26,10 @@
 
     sendfile        on;
     #tcp_nopush     on;
-    #tcp_nodelay    on;
 
     #keepalive_timeout  0;
+    keepalive_timeout  65;
+    tcp_nodelay        on;
 
     #gzip  on;
 
@@ -60,7 +61,8 @@
         #    include        conf/fastcgi_params;
         #}
 
-        # deny access to .htaccess files
+        # deny access to .htaccess files, if Apache's document root
+        # concurs with nginx's one
         #
         #location ~ /\.ht {
         #    deny  all;