Mercurial > hg > nginx
changeset 3797:96f17c930a9e
revert processing NGX_OK and NGX_DONE in rewrite phase changed in r3634
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 29 Nov 2010 14:01:17 +0000 |
parents | 7dec2852e8fd |
children | 61d64ab739a0 |
files | src/http/ngx_http_core_module.c |
diffstat | 1 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c Mon Nov 29 09:23:25 2010 +0000 +++ b/src/http/ngx_http_core_module.c Mon Nov 29 14:01:17 2010 +0000 @@ -900,12 +900,21 @@ 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);