summaryrefslogtreecommitdiffhomepage
path: root/conf/nginx.conf
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2006-05-04 15:32:46 +0000
committerIgor Sysoev <igor@sysoev.ru>2006-05-04 15:32:46 +0000
commitac72bd17d1c845b81aa9d1050b764ba1018ae462 (patch)
treee7df03607b73b7c1cca5438fa02b6022c0e37e74 /conf/nginx.conf
parent2cca46c774157b529c439eafe0083d75e74f138a (diff)
downloadnginx-release-0.3.44.tar.gz
nginx-release-0.3.44.tar.bz2
nginx-0.3.44-RELEASE importrelease-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.
Diffstat (limited to 'conf/nginx.conf')
-rw-r--r--conf/nginx.conf6
1 files changed, 4 insertions, 2 deletions
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 11404add4..2f5785a02 100644
--- 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;