From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 14 Dec 2010 10:38:42 +0000 (+0000)
Subject: merge r3798, r3806, r3807:
X-Git-Tag: release-0.8.54~2
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=53a398894208a70a6fcbcea78cc5f2ef1727b326;p=nginx.git

merge r3798, r3806, r3807:

revert processing NGX_DONE in rewrite phase changed in r3634
---

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 0345be965..488688ae2 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -910,7 +910,11 @@ ngx_http_core_rewrite_phase(ngx_http_request_t *r, ngx_http_phase_handler_t *ph)
         return NGX_AGAIN;
     }
 
-    /* rc == NGX_OK || rc == NGX_ERROR || rc == NGX_HTTP_...  */
+    if (rc == NGX_DONE) {
+        return NGX_OK;
+    }
+
+    /* NGX_OK, NGX_AGAIN, NGX_ERROR, NGX_HTTP_...  */
 
     ngx_http_finalize_request(r, rc);