diff options
author | Igor Sysoev <igor@sysoev.ru> | 2006-08-18 14:17:54 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2006-08-18 14:17:54 +0000 |
commit | 5fede1e415ae97ee9221d60a1208d47bdaaae34d (patch) | |
tree | 22d4b4d8948e68926e1699b54b4d1bc325bfb0ec /src/http/ngx_http_special_response.c | |
parent | 51c53f9bf16804c9d8c9c55c45dc05ffeadda4b8 (diff) | |
download | nginx-release-0.3.60.tar.gz nginx-release-0.3.60.zip |
nginx-0.3.60-RELEASE importrelease-0.3.60
*) Bugfix: a worker process may got caught in an endless loop while an
error redirection; the bug had appeared in 0.3.59.
Diffstat (limited to 'src/http/ngx_http_special_response.c')
-rw-r--r-- | src/http/ngx_http_special_response.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c index abdf62482..a44c51c6a 100644 --- a/src/http/ngx_http_special_response.c +++ b/src/http/ngx_http_special_response.c @@ -312,6 +312,7 @@ ngx_http_special_response_handler(ngx_http_request_t *r, ngx_int_t error) } r->headers_out.status = error; + r->err_status = error; if (r->keepalive != 0) { switch (error) { @@ -340,7 +341,7 @@ ngx_http_special_response_handler(ngx_http_request_t *r, ngx_int_t error) clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); - if (clcf->error_pages) { + if (r->uri_changes && clcf->error_pages) { err_page = clcf->error_pages->elts; |