diff options
author | Igor Sysoev <igor@sysoev.ru> | 2006-05-04 19:32:46 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2006-05-04 19:32:46 +0400 |
commit | ac72bd17d1c845b81aa9d1050b764ba1018ae462 (patch) | |
tree | e7df03607b73b7c1cca5438fa02b6022c0e37e74 /conf | |
parent | 2cca46c774157b529c439eafe0083d75e74f138a (diff) |
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')
-rw-r--r-- | conf/koi-win | 14 | ||||
-rw-r--r-- | conf/nginx.conf | 6 |
2 files changed, 18 insertions, 2 deletions
diff --git a/conf/koi-win b/conf/koi-win index 92cabb140..2b12b8da1 100644 --- a/conf/koi-win +++ b/conf/koi-win @@ -10,8 +10,22 @@ charset_map koi8-r windows-1251 { 9E B7 ; # · A3 B8 ; # small yo + A4 BA ; # small Ukrainian ye + + A6 B3 ; # small Ukrainian i + A7 BF ; # small Ukrainian j + + AD B4 ; # small Ukrainian soft g + AE A2 ; # small Byelorussian short u B3 A8 ; # capital YO + B4 AA ; # capital Ukrainian YE + + B6 B2 ; # capital Ukrainian I + B7 AF ; # capital Ukrainian J + + BD A5 ; # capital Ukrainian soft G + BE A1 ; # capital Byelorussian short U BF A9 ; # (C) 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; |