Mercurial > hg > nginx
changeset 3831:159a513d42fa stable-0.8
merge r3798, r3806, r3807:
revert processing NGX_DONE in rewrite phase changed in r3634
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Tue, 14 Dec 2010 10:38:42 +0000 |
| parents | d4c4569e09ae |
| children | db5bfb61ef9c |
| files | src/http/ngx_http_core_module.c |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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_req 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);