Mercurial > hg > nginx-vendor-0-5
diff conf/nginx.conf @ 206:3866d57d9cfd NGINX_0_3_50
nginx 0.3.50
*) 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 <http://sysoev.ru> |
---|---|
date | Wed, 28 Jun 2006 00:00:00 +0400 |
parents | 003bd800ec2a |
children | c982febb7588 |
line wrap: on
line diff
--- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -20,7 +20,7 @@ http { #log_format main '$remote_addr - $remote_user [$time_local] $status ' # '"$request" $body_bytes_sent "$http_referer" ' - # '"$http_user_agent" "http_x_forwarded_for"'; + # '"$http_user_agent" "$http_x_forwarded_for"'; #access_log logs/access.log main; @@ -46,6 +46,15 @@ http { index index.html index.htm; } + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 # #location ~ \.php$ { @@ -67,9 +76,6 @@ http { #location ~ /\.ht { # deny all; #} - - #error_page 404 /404.html; - #error_page 500 502 503 504 /50x.html; }