Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 1585:4435ca2e467d

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 Thu, 18 Oct 2007 11:36:58 +0000
parents c9a0f82deb7c
children ad18d4814a86
comparison
equal deleted inserted replaced
1584:25427a0e9559 1585:4435ca2e467d
183 ngx_conf_set_flag_slot, 183 ngx_conf_set_flag_slot,
184 NGX_HTTP_SRV_CONF_OFFSET, 184 NGX_HTTP_SRV_CONF_OFFSET,
185 offsetof(ngx_http_core_srv_conf_t, ignore_invalid_headers), 185 offsetof(ngx_http_core_srv_conf_t, ignore_invalid_headers),
186 NULL }, 186 NULL },
187 187
188 { ngx_string("merge_slashes"),
189 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
190 ngx_conf_set_flag_slot,
191 NGX_HTTP_SRV_CONF_OFFSET,
192 offsetof(ngx_http_core_srv_conf_t, merge_slashes),
193 NULL },
194
188 { ngx_string("location"), 195 { ngx_string("location"),
189 NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE12, 196 NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE12,
190 ngx_http_core_location, 197 ngx_http_core_location,
191 NGX_HTTP_SRV_CONF_OFFSET, 198 NGX_HTTP_SRV_CONF_OFFSET,
192 0, 199 0,
2231 cscf->request_pool_size = NGX_CONF_UNSET_SIZE; 2238 cscf->request_pool_size = NGX_CONF_UNSET_SIZE;
2232 cscf->client_header_timeout = NGX_CONF_UNSET_MSEC; 2239 cscf->client_header_timeout = NGX_CONF_UNSET_MSEC;
2233 cscf->client_header_buffer_size = NGX_CONF_UNSET_SIZE; 2240 cscf->client_header_buffer_size = NGX_CONF_UNSET_SIZE;
2234 cscf->optimize_server_names = NGX_CONF_UNSET; 2241 cscf->optimize_server_names = NGX_CONF_UNSET;
2235 cscf->ignore_invalid_headers = NGX_CONF_UNSET; 2242 cscf->ignore_invalid_headers = NGX_CONF_UNSET;
2243 cscf->merge_slashes = NGX_CONF_UNSET;
2236 2244
2237 return cscf; 2245 return cscf;
2238 } 2246 }
2239 2247
2240 2248
2322 ngx_conf_merge_value(conf->optimize_server_names, 2330 ngx_conf_merge_value(conf->optimize_server_names,
2323 prev->optimize_server_names, 1); 2331 prev->optimize_server_names, 1);
2324 2332
2325 ngx_conf_merge_value(conf->ignore_invalid_headers, 2333 ngx_conf_merge_value(conf->ignore_invalid_headers,
2326 prev->ignore_invalid_headers, 1); 2334 prev->ignore_invalid_headers, 1);
2335
2336 ngx_conf_merge_value(conf->merge_slashes, prev->merge_slashes, 1);
2327 2337
2328 return NGX_CONF_OK; 2338 return NGX_CONF_OK;
2329 } 2339 }
2330 2340
2331 2341