Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 675:e924670896ab release-0.3.59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
674:c4b2ba082d99 675:e924670896ab
1091 { 1091 {
1092 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_HTTP_404); 1092 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_HTTP_404);
1093 return; 1093 return;
1094 } 1094 }
1095 1095
1096 if (u->conf->redirect_404) { 1096 if (u->conf->intercept_404) {
1097 rc = (r->err_ctx == NULL) ? 404 : 204; 1097 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_NOT_FOUND);
1098 ngx_http_upstream_finalize_request(r, u, rc);
1099 return; 1098 return;
1100 } 1099 }
1101 } 1100 }
1102 1101
1103 1102
1104 if (u->headers_in.status_n >= NGX_HTTP_BAD_REQUEST 1103 if (u->headers_in.status_n >= NGX_HTTP_BAD_REQUEST
1105 && u->conf->intercept_errors 1104 && u->conf->intercept_errors)
1106 && r->err_ctx == NULL)
1107 { 1105 {
1108 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); 1106 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
1109 1107
1110 if (clcf->error_pages) { 1108 if (clcf->error_pages) {
1111 1109