Changeset 3f2f24 for server/src/http/ngx_http_upstream.c

Timestamp:

01/13/09 20:53:40 (3 years ago)

Author:

George Potapov <nephrite@…>

Branches:

master-v0.7, upstream_count_limit

Children:

b3765f, ca37e8

Parents:

698075

git-author:

George Potapov <nephrite@…> (01/13/09 20:53:40)

git-committer:

George Potapov <nephrite@…> (01/13/09 20:53:40)

Message:

applied Maxim Dounin's patch to fix bug which sended bad 404 page when
memcached didn't find q requested key

File:

• server/src/http/ngx_http_upstream.c (modified) (3 diffs)

server/src/http/ngx_http_upstream.c

@@ -1518 +1518 @@
         }
 
-        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)
 
@@ -1548 +1543 @@
     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;
@@ -1557 +1559 @@
         return NGX_DECLINED;
     }
-
-    status = u->headers_in.status_n;
 
     err_page = clcf->error_pages->elts;