diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-11-29 14:01:17 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-11-29 14:01:17 +0000 |
| commit | 8c6144f0221882b80a6806202f973da76796474a (patch) | |
| tree | ed08cccac5fc7c8c2698ec7363e26e83e11a2fd7 /src | |
| parent | d4b08c9134d89ed17592935d56e611ae0fa31d32 (diff) | |
| download | nginx-8c6144f0221882b80a6806202f973da76796474a.tar.gz nginx-8c6144f0221882b80a6806202f973da76796474a.zip | |
revert processing NGX_OK and NGX_DONE in rewrite phase changed in r3634
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 11 |
1 files changed, 10 insertions, 1 deletions
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); |