From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 29 Nov 2010 14:01:17 +0000 (+0000)
Subject: revert processing NGX_OK and NGX_DONE in rewrite phase changed in r3634
X-Git-Tag: release-0.9.0~5
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=8c6144f0221882b80a6806202f973da76796474a;p=nginx.git

revert processing NGX_OK and 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 2465a2d48..0e8d5a497 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -900,12 +900,21 @@ ngx_http_core_rewrite_phase(ngx_http_request_t *r, ngx_http_phase_handler_t *ph)
 
     rc = ph->handler(r);
 
+    if (rc == NGX_OK) {
+        r->phase_handler = ph->next;
+        return NGX_AGAIN;
+    }
+
     if (rc == NGX_DECLINED) {
         r->phase_handler++;
         return NGX_AGAIN;
     }
 
-    /* rc == NGX_OK || rc == NGX_ERROR || rc == NGX_HTTP_...  */
+    if (rc == NGX_DONE) {
+        return NGX_OK;
+    }
+
+    /* NGX_AGAIN || rc == NGX_ERROR || rc == NGX_HTTP_...  */
 
     ngx_http_finalize_request(r, rc);