Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 1722:3b7262e720c1 stable-0.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge_slashes
author Igor Sysoev <igor@sysoev.ru>
date Wed, 12 Dec 2007 20:43:39 +0000
parents 20a0f2880d45
children 9b047c9e96c1
comparison
equal deleted inserted replaced
1721:b2829cbf9eb4 1722:3b7262e720c1
181 ngx_conf_set_flag_slot, 181 ngx_conf_set_flag_slot,
182 NGX_HTTP_SRV_CONF_OFFSET, 182 NGX_HTTP_SRV_CONF_OFFSET,
183 offsetof(ngx_http_core_srv_conf_t, ignore_invalid_headers), 183 offsetof(ngx_http_core_srv_conf_t, ignore_invalid_headers),
184 NULL }, 184 NULL },
185 185
186 { ngx_string("merge_slashes"),
187 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
188 ngx_conf_set_flag_slot,
189 NGX_HTTP_SRV_CONF_OFFSET,
190 offsetof(ngx_http_core_srv_conf_t, merge_slashes),
191 NULL },
192
186 { ngx_string("location"), 193 { ngx_string("location"),
187 NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE12, 194 NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE12,
188 ngx_http_core_location, 195 ngx_http_core_location,
189 NGX_HTTP_SRV_CONF_OFFSET, 196 NGX_HTTP_SRV_CONF_OFFSET,
190 0, 197 0,
2211 cscf->request_pool_size = NGX_CONF_UNSET_SIZE; 2218 cscf->request_pool_size = NGX_CONF_UNSET_SIZE;
2212 cscf->client_header_timeout = NGX_CONF_UNSET_MSEC; 2219 cscf->client_header_timeout = NGX_CONF_UNSET_MSEC;
2213 cscf->client_header_buffer_size = NGX_CONF_UNSET_SIZE; 2220 cscf->client_header_buffer_size = NGX_CONF_UNSET_SIZE;
2214 cscf->optimize_server_names = NGX_CONF_UNSET; 2221 cscf->optimize_server_names = NGX_CONF_UNSET;
2215 cscf->ignore_invalid_headers = NGX_CONF_UNSET; 2222 cscf->ignore_invalid_headers = NGX_CONF_UNSET;
2223 cscf->merge_slashes = NGX_CONF_UNSET;
2216 2224
2217 return cscf; 2225 return cscf;
2218 } 2226 }
2219 2227
2220 2228
2302 ngx_conf_merge_value(conf->optimize_server_names, 2310 ngx_conf_merge_value(conf->optimize_server_names,
2303 prev->optimize_server_names, 1); 2311 prev->optimize_server_names, 1);
2304 2312
2305 ngx_conf_merge_value(conf->ignore_invalid_headers, 2313 ngx_conf_merge_value(conf->ignore_invalid_headers,
2306 prev->ignore_invalid_headers, 1); 2314 prev->ignore_invalid_headers, 1);
2315
2316 ngx_conf_merge_value(conf->merge_slashes, prev->merge_slashes, 1);
2307 2317
2308 return NGX_CONF_OK; 2318 return NGX_CONF_OK;
2309 } 2319 }
2310 2320
2311 2321