diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-12-14 10:38:42 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-12-14 10:38:42 +0000 |
| commit | 53a398894208a70a6fcbcea78cc5f2ef1727b326 (patch) | |
| tree | e5fa27b5f5f5f355019d6b3ca328cc88834dc635 | |
| parent | a9b3cf0c4afd8ac856a74f00e3d5414c8f064ffd (diff) | |
| download | nginx-53a398894208a70a6fcbcea78cc5f2ef1727b326.tar.gz nginx-53a398894208a70a6fcbcea78cc5f2ef1727b326.tar.bz2 | |
merge r3798, r3806, r3807:
revert processing NGX_DONE in rewrite phase changed in r3634
| -rw-r--r-- | src/http/ngx_http_core_module.c | 6 |
1 files changed, 5 insertions, 1 deletions
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); |