summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-12-23 15:31:16 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-12-23 15:31:16 +0000
commite146ebd813ee01d459ce8b558fe379ec37b874aa (patch)
treee50eeeb6f5c999a288a11ed9b68fd4499fa9ec18 /src
parent3662f36a542c9b3ccc7935befc88ec0a063740d5 (diff)
downloadnginx-e146ebd813ee01d459ce8b558fe379ec37b874aa.tar.gz
nginx-e146ebd813ee01d459ce8b558fe379ec37b874aa.tar.bz2
allow to handle 301/302 in error_page
Diffstat (limited to 'src')
-rw-r--r--src/http/ngx_http_core_module.c4
-rw-r--r--src/http/ngx_http_upstream.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 83779a455..f3b62d9d4 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -3900,9 +3900,9 @@ ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_ERROR;
}
- if (err->status < 400 || err->status > 599) {
+ if (err->status < 300 || err->status > 599) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "value \"%V\" must be between 400 and 599",
+ "value \"%V\" must be between 300 and 599",
&value[i]);
return NGX_CONF_ERROR;
}
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 35bd35f3a..fa434898f 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1548,7 +1548,7 @@ ngx_http_upstream_process_header(ngx_http_request_t *r, ngx_http_upstream_t *u)
/* rc == NGX_OK */
- if (u->headers_in.status_n >= NGX_HTTP_BAD_REQUEST) {
+ if (u->headers_in.status_n > NGX_HTTP_SPECIAL_RESPONSE) {
if (r->subrequest_in_memory) {
u->buffer.last = u->buffer.pos;