Mercurial > hg > nginx
changeset 2441:0c117a89f399
in miss case memcached module returned END instead of default 404 page body
the bug has been introduced in r2269
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 15 Jan 2009 13:10:45 +0000 |
parents | 939b40aa9ab4 |
children | 6978f3827a5c |
files | src/http/ngx_http_upstream.c |
diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c Tue Jan 13 06:47:29 2009 +0000 +++ b/src/http/ngx_http_upstream.c Thu Jan 15 13:10:45 2009 +0000 @@ -1441,11 +1441,6 @@ 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_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 @@ return NGX_DECLINED; } - status = u->headers_in.status_n; - err_page = clcf->error_pages->elts; for (i = 0; i < clcf->error_pages->nelts; i++) {