merge r3798, r3806, r3807:

revert processing NGX_DONE in rewrite phase changed in r3634
This commit is contained in:
Igor Sysoev 2010-12-14 10:38:42 +00:00
parent a9b3cf0c4a
commit 53a3988942

View File

@ -910,7 +910,11 @@ ngx_http_core_rewrite_phase(ngx_http_request_t *r, ngx_http_phase_handler_t *ph)
return NGX_AGAIN; 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); ngx_http_finalize_request(r, rc);