mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-10 19:42:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

in miss case memcached module returned END instead of default 404 page body

Browse Source 
the bug has been introduced in r2269
This commit is contained in:
Igor Sysoev 2009-01-15 13:10:45 +00:00
parent 77a797436d
commit f7204173f9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/http/ngx_http_upstream.c
View File

@ -1441,11 +1441,6 @@ ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u)
return NGX_OK;
}
if (status == NGX_HTTP_NOT_FOUND && u->conf->intercept_404) {
ngx_http_upstream_finalize_request(r, u, NGX_HTTP_NOT_FOUND);
return NGX_OK;
}
#if (NGX_HTTP_CACHE)
if (u->peer.tries == 0 && u->stale && (u->conf->use_stale & un->mask)) {
@ -1471,6 +1466,13 @@ ngx_http_upstream_intercept_errors(ngx_http_request_t *r,
ngx_http_err_page_t *err_page;
ngx_http_core_loc_conf_t *clcf;
status = u->headers_in.status_n;
if (status == NGX_HTTP_NOT_FOUND && u->conf->intercept_404) {
ngx_http_upstream_finalize_request(r, u, NGX_HTTP_NOT_FOUND);
return NGX_OK;
}
if (!u->conf->intercept_errors) {
return NGX_DECLINED;
}
@ -1481,8 +1483,6 @@ ngx_http_upstream_intercept_errors(ngx_http_request_t *r,
return NGX_DECLINED;
}
status = u->headers_in.status_n;
err_page = clcf->error_pages->elts;
for (i = 0; i < clcf->error_pages->nelts; i++) {