diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-07-30 09:15:47 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2007-07-30 09:15:47 +0000 |
| commit | ad5526a0773dea7fca82cca22433e2cb0b327837 (patch) | |
| tree | 83f8ffae019ea0d39633c2c5520b3dfa6cfd47d2 /src/http/ngx_http.c | |
| parent | b9b71bc11c42dce8b014ee3cf3a1f5dc7b9ecc2f (diff) | |
| download | nginx-ad5526a0773dea7fca82cca22433e2cb0b327837.tar.gz | |
Changes with nginx 0.6.6 30 Jul 2007v0.6.6
*) Feature: the --sysconfdir=PATH option in configure.
*) Feature: named locations.
*) Feature: the $args variable can be set with the "set" directive.
*) Feature: the $is_args variable.
*) Bugfix: fair big weight upstream balancer.
*) Bugfix: if a client has closed connection to mail proxy then nginx
might not close connection to backend.
*) Bugfix: if the same host without specified port was used as backend
for HTTP and HTTPS, then nginx used only one port - 80 or 443.
*) Bugfix: fix building on Solaris/amd64 by Sun Studio 11 and early
versions; bug appeared in 0.6.4.
Diffstat (limited to 'src/http/ngx_http.c')
| -rw-r--r-- | src/http/ngx_http.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 5823a2b91..dfe6eff70 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -401,6 +401,7 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) cmcf->phase_engine.server_rewrite_index = (ngx_uint_t) -1; + cmcf->phase_engine.location_rewrite_index = (ngx_uint_t) -1; find_config_index = 0; use_rewrite = cmcf->phases[NGX_HTTP_REWRITE_PHASE].handlers.nelts ? 1 : 0; use_access = cmcf->phases[NGX_HTTP_ACCESS_PHASE].handlers.nelts ? 1 : 0; @@ -442,6 +443,14 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) continue; + case NGX_HTTP_REWRITE_PHASE: + if (cmcf->phase_engine.location_rewrite_index == (ngx_uint_t) -1) { + cmcf->phase_engine.location_rewrite_index = n; + } + checker = ngx_http_core_generic_phase; + + break; + case NGX_HTTP_POST_REWRITE_PHASE: if (use_rewrite) { ph->checker = ngx_http_core_post_rewrite_phase; |