comparison src/http/modules/ngx_http_rewrite_module.c @ 638:692f4d4d7f10 NGINX_1_0_9

nginx 1.0.9 *) Change: now the 0x7F-0x1F characters are escaped as \xXX in an access_log. *) Change: now SIGWINCH signal works only in daemon mode. *) 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. *) Feature: accept filters are now supported on NetBSD. *) Feature: the "uwsgi_buffering" and "scgi_buffering" directives. Thanks to Peter Smit. *) Bugfix: a segmentation fault occurred on start or while reconfiguration if the "ssl" directive was used at http level and there was no "ssl_certificate" defined. *) 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. *) Bugfix: non-cacheable responses might be cached if "proxy_cache_bypass" directive was used. Thanks to John Ferlito. *) Bugfix: cached responses with an empty body were returned incorrectly; the bug had appeared in 0.8.31. *) Bugfix: 201 responses of the ngx_http_dav_module were incorrect; the bug had appeared in 0.8.32. *) Bugfix: in the "return" directive. *) Bugfix: the "ssl_verify_client", "ssl_verify_depth", and "ssl_prefer_server_ciphers" directives might work incorrectly if SNI was used.
author Igor Sysoev <http://sysoev.ru>
date Tue, 01 Nov 2011 00:00:00 +0400
parents 4d3e880ce86c
children ad25218fd14b
comparison
equal deleted inserted replaced
637:ea7441793bba 638:692f4d4d7f10
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;
165 while (*(uintptr_t *) e->ip) { 177 while (*(uintptr_t *) e->ip) {
166 code = *(ngx_http_script_code_pt *) e->ip; 178 code = *(ngx_http_script_code_pt *) e->ip;
167 code(e); 179 code(e);
168 } 180 }
169 181
170 if (e->status == NGX_DECLINED) { 182 if (e->status < NGX_HTTP_BAD_REQUEST) {
171 return NGX_DECLINED; 183 return e->status;
172 } 184 }
173 185
174 if (r->err_status == 0) { 186 if (r->err_status == 0) {
175 return e->status; 187 return e->status;
176 } 188 }