Mercurial > hg > nginx
comparison src/http/modules/ngx_http_rewrite_module.c @ 4257:031e2dc9c5d7 stable-1.0
Merging r4209:
Skipping location rewrite phase for server null location.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 01 Nov 2011 14:19:13 +0000 |
parents | b79dbadb3d5e |
children | d620f497c50f |
comparison
equal
deleted
inserted
replaced
4256:f83b47591642 | 4257:031e2dc9c5d7 |
---|---|
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; |