Mercurial > hg > nginx
diff src/http/ngx_http_upstream.c @ 675:e924670896ab release-0.3.59
nginx-0.3.59-RELEASE import
*) Feature: now is possible to do several redirection using the
"error_page" directive.
*) Bugfix: the "dav_access" directive did not support three parameters.
*) Bugfix: the "error_page" directive did not changes the
"Content-Type" header line after the "X-Accel-Redirect" was used;
the bug had appeared in 0.3.58.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 16 Aug 2006 13:09:33 +0000 |
parents | b80f94fa2197 |
children | 7e24168b0853 |
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c Mon Aug 14 15:09:38 2006 +0000 +++ b/src/http/ngx_http_upstream.c Wed Aug 16 13:09:33 2006 +0000 @@ -1093,17 +1093,15 @@ return; } - if (u->conf->redirect_404) { - rc = (r->err_ctx == NULL) ? 404 : 204; - ngx_http_upstream_finalize_request(r, u, rc); + if (u->conf->intercept_404) { + ngx_http_upstream_finalize_request(r, u, NGX_HTTP_NOT_FOUND); return; } } if (u->headers_in.status_n >= NGX_HTTP_BAD_REQUEST - && u->conf->intercept_errors - && r->err_ctx == NULL) + && u->conf->intercept_errors) { clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);