Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_rewrite_module.c @ 644:6f21ae02fb01 NGINX_1_1_6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.1.6 *) Change in internal API: now module context data are cleared while internal redirect to named location. Requested by Yichun Zhang. *) Change: if a server in an upstream failed, only one request will be sent to it after fail_timeout; the server will be considered alive if it will successfully respond to the request. *) Change: now the 0x7F-0x1F characters are escaped as \xXX in an access_log. *) Feature: "proxy/fastcgi/scgi/uwsgi_ignore_headers" directives support the following additional values: X-Accel-Limit-Rate, X-Accel-Buffering, X-Accel-Charset. *) Feature: decrease of memory consumption if SSL is used. *) Bugfix: some UTF-8 characters were processed incorrectly. Thanks to Alexey Kuts. *) Bugfix: the ngx_http_rewrite_module directives specified at "server" level were executed twice if no matching locations were defined. *) Bugfix: a socket leak might occurred if "aio sendfile" was used. *) Bugfix: connections with fast clients might be closed after send_timeout if file AIO was used. *) Bugfix: in the ngx_http_autoindex_module. *) Bugfix: the module ngx_http_mp4_module did not support seeking on 32-bit platforms.
author Igor Sysoev <http://sysoev.ru>
date Mon, 17 Oct 2011 00:00:00 +0400
parents d3cf6c6b0043
children d0f7a625f27c
comparison
equal deleted inserted replaced
643:a4bb0b481f6c 644:6f21ae02fb01
133 133
134 134
135 static ngx_int_t 135 static ngx_int_t
136 ngx_http_rewrite_handler(ngx_http_request_t *r) 136 ngx_http_rewrite_handler(ngx_http_request_t *r)
137 { 137 {
138 ngx_int_t index;
138 ngx_http_script_code_pt code; 139 ngx_http_script_code_pt code;
139 ngx_http_script_engine_t *e; 140 ngx_http_script_engine_t *e;
141 ngx_http_core_srv_conf_t *cscf;
142 ngx_http_core_main_conf_t *cmcf;
140 ngx_http_rewrite_loc_conf_t *rlcf; 143 ngx_http_rewrite_loc_conf_t *rlcf;
144
145 cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
146 cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
147 index = cmcf->phase_engine.location_rewrite_index;
148
149 if (r->phase_handler == index && r->loc_conf == cscf->ctx->loc_conf) {
150 /* skipping location rewrite phase for server null location */
151 return NGX_DECLINED;
152 }
141 153
142 rlcf = ngx_http_get_module_loc_conf(r, ngx_http_rewrite_module); 154 rlcf = ngx_http_get_module_loc_conf(r, ngx_http_rewrite_module);
143 155
144 if (rlcf->codes == NULL) { 156 if (rlcf->codes == NULL) {
145 return NGX_DECLINED; 157 return NGX_DECLINED;