merge r3798, r3806, r3807:

revert processing NGX_DONE in rewrite phase changed in r3634
2010-12-14 10:38:42 +00:00 · 2010-12-14 10:38:42 +00:00 · c38c0665ff
parent 485909346d
commit c38c0665ff
1 changed files with 5 additions and 1 deletions
--- 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);