Mercurial > hg > nginx-vendor-current

diff src/http/ngx_http_upstream.c @ 224:9909a161eb28 NGINX_0_3_59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 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; bug appeared in 0.3.58.
author Igor Sysoev <http://sysoev.ru>
date Wed, 16 Aug 2006 00:00:00 +0400
parents dd6c66b5b0e2
children 38e7b94d63ac
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1093,17 +1093,15 @@ ngx_http_upstream_process_header(ngx_eve
             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);