Mercurial > hg > nginx
comparison conf/nginx.conf @ 657:400711951595 release-0.3.50
nginx-0.3.50-RELEASE import
*) Change: the "proxy_redirect_errors" and "fastcgi_redirect_errors"
directives was renamed to the "proxy_intercept_errors" and
"fastcgi_intercept_errors" directives.
*) Feature: the ngx_http_charset_module supports the recoding from the
single byte encodings to the UTF-8 encoding and back.
*) Feature: the "X-Accel-Charset" response header line is supported in
proxy and FastCGI mode.
*) Bugfix: the "\" escape symbol in the "\"" and "\'" pairs in the SSI
command was removed only if the command also has the "$" symbol.
*) Bugfix: the "<!--" string might be added on some conditions in the
SSI after inclusion.
*) Bugfix: if the "Content-Length: 0" header line was in response, then
in nonbuffered proxying mode the client connection was not closed.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 28 Jun 2006 16:00:26 +0000 |
parents | 4946078f0a79 |
children | 1f3cc64393b6 |
comparison
equal
deleted
inserted
replaced
656:97f36f8e65dd | 657:400711951595 |
---|---|
18 include conf/mime.types; | 18 include conf/mime.types; |
19 default_type application/octet-stream; | 19 default_type application/octet-stream; |
20 | 20 |
21 #log_format main '$remote_addr - $remote_user [$time_local] $status ' | 21 #log_format main '$remote_addr - $remote_user [$time_local] $status ' |
22 # '"$request" $body_bytes_sent "$http_referer" ' | 22 # '"$request" $body_bytes_sent "$http_referer" ' |
23 # '"$http_user_agent" "http_x_forwarded_for"'; | 23 # '"$http_user_agent" "$http_x_forwarded_for"'; |
24 | 24 |
25 #access_log logs/access.log main; | 25 #access_log logs/access.log main; |
26 | 26 |
27 sendfile on; | 27 sendfile on; |
28 #tcp_nopush on; | 28 #tcp_nopush on; |
44 location / { | 44 location / { |
45 root html; | 45 root html; |
46 index index.html index.htm; | 46 index index.html index.htm; |
47 } | 47 } |
48 | 48 |
49 #error_page 404 /404.html; | |
50 | |
51 # redirect server error pages to the static page /50x.html | |
52 # | |
53 error_page 500 502 503 504 /50x.html; | |
54 location = /50x.html { | |
55 root html; | |
56 } | |
57 | |
49 # proxy the PHP scripts to Apache listening on 127.0.0.1:80 | 58 # proxy the PHP scripts to Apache listening on 127.0.0.1:80 |
50 # | 59 # |
51 #location ~ \.php$ { | 60 #location ~ \.php$ { |
52 # proxy_pass http://127.0.0.1; | 61 # proxy_pass http://127.0.0.1; |
53 #} | 62 #} |
65 # concurs with nginx's one | 74 # concurs with nginx's one |
66 # | 75 # |
67 #location ~ /\.ht { | 76 #location ~ /\.ht { |
68 # deny all; | 77 # deny all; |
69 #} | 78 #} |
70 | |
71 #error_page 404 /404.html; | |
72 #error_page 500 502 503 504 /50x.html; | |
73 } | 79 } |
74 | 80 |
75 | 81 |
76 # another virtual host using mix of IP-, name-, and port-based configuration | 82 # another virtual host using mix of IP-, name-, and port-based configuration |
77 # | 83 # |