Mercurial > hg > nginx-vendor-current

diff conf/nginx.conf @ 194:003bd800ec2a NGINX_0_3_44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.3.44 *) 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.
author Igor Sysoev <http://sysoev.ru>
date Thu, 04 May 2006 00:00:00 +0400
parents 73e8476f9142
children 3866d57d9cfd
line wrap: on
line diff
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -26,9 +26,10 @@ http {
 
     sendfile        on;
     #tcp_nopush     on;
-    #tcp_nodelay    on;
 
     #keepalive_timeout  0;
+    keepalive_timeout  65;
+    tcp_nodelay        on;
 
     #gzip  on;
 
@@ -60,7 +61,8 @@ http {
         #    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;