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 0345be9658cf1c190b433fe99ac337f864c673ab..488688ae2ad414d8d740bc7c7ef26330c3540df2 100644 (file)
--- 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);