diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-08-16 13:09:33 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-08-16 13:09:33 +0000 |
| commit | ef316430492ce988b71f2d2839c12e3d3922a66b (patch) | |
| tree | 214292c0f152fd374940002499011024280097a8 /src/http/ngx_http_upstream.c | |
| parent | 2fb72a2205fd4a2bf450487032df43e5e1d9b14f (diff) | |
| download | nginx-release-0.3.59.tar.gz nginx-release-0.3.59.zip | |
nginx-0.3.59-RELEASE importrelease-0.3.59
*) 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.
Diffstat (limited to 'src/http/ngx_http_upstream.c')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index d5b7aee53..cede08d27 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -1093,17 +1093,15 @@ ngx_http_upstream_process_header(ngx_event_t *rev) 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); |