Mercurial > hg > nginx
changeset 3634:40e356cf4176
add files missed in the previuos commit
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Fri, 18 Jun 2010 15:16:18 +0000 |
| parents | 187783310b65 |
| children | c0113b6648de |
| files | src/http/ngx_http_core_module.c src/http/ngx_http_core_module.h |
| diffstat | 2 files changed, 26 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c Fri Jun 18 15:15:20 2010 +0000 +++ b/src/http/ngx_http_core_module.c Fri Jun 18 15:16:18 2010 +0000 @@ -865,7 +865,7 @@ /* * generic phase checker, - * used by the post read, server rewrite, rewrite, and pre-access phases + * used by the post read and pre-access phases */ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, @@ -896,6 +896,29 @@ ngx_int_t +ngx_http_core_rewrite_phase(ngx_http_request_t *r, ngx_http_phase_handler_t *ph) +{ + ngx_int_t rc; + + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "rewrite phase: %ui", r->phase_handler); + + rc = ph->handler(r); + + if (rc == NGX_DECLINED) { + r->phase_handler++; + return NGX_AGAIN; + } + + /* rc == NGX_OK || rc == NGX_ERROR || rc == NGX_HTTP_... */ + + ngx_http_finalize_request(r, rc); + + return NGX_OK; +} + + +ngx_int_t ngx_http_core_find_config_phase(ngx_http_request_t *r, ngx_http_phase_handler_t *ph) {
--- a/src/http/ngx_http_core_module.h Fri Jun 18 15:15:20 2010 +0000 +++ b/src/http/ngx_http_core_module.h Fri Jun 18 15:16:18 2010 +0000 @@ -429,6 +429,8 @@ void ngx_http_core_run_phases(ngx_http_request_t *r); ngx_int_t ngx_http_core_generic_phase(ngx_http_request_t *r, ngx_http_phase_handler_t *ph); +ngx_int_t ngx_http_core_rewrite_phase(ngx_http_request_t *r, + ngx_http_phase_handler_t *ph); ngx_int_t ngx_http_core_find_config_phase(ngx_http_request_t *r, ngx_http_phase_handler_t *ph); ngx_int_t ngx_http_core_post_rewrite_phase(ngx_http_request_t *r,