Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 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 | 173a45374a97 |
children |
comparison
equal
deleted
inserted
replaced
3830:d4c4569e09ae | 3831:159a513d42fa |
---|---|
908 if (rc == NGX_DECLINED) { | 908 if (rc == NGX_DECLINED) { |
909 r->phase_handler++; | 909 r->phase_handler++; |
910 return NGX_AGAIN; | 910 return NGX_AGAIN; |
911 } | 911 } |
912 | 912 |
913 /* rc == NGX_OK || rc == NGX_ERROR || rc == NGX_HTTP_... */ | 913 if (rc == NGX_DONE) { |
914 return NGX_OK; | |
915 } | |
916 | |
917 /* NGX_OK, NGX_AGAIN, NGX_ERROR, NGX_HTTP_... */ | |
914 | 918 |
915 ngx_http_finalize_request(r, rc); | 919 ngx_http_finalize_request(r, rc); |
916 | 920 |
917 return NGX_OK; | 921 return NGX_OK; |
918 } | 922 } |