Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 2256:8c17cfe63d2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
underscores_in_headers
author Igor Sysoev <igor@sysoev.ru>
date Wed, 24 Sep 2008 14:02:50 +0000
parents f62751dab60d
children 07bf557a2e40
comparison
equal deleted inserted replaced
2255:fb7995c7bdd9 2256:8c17cfe63d2c
229 ngx_conf_set_flag_slot, 229 ngx_conf_set_flag_slot,
230 NGX_HTTP_SRV_CONF_OFFSET, 230 NGX_HTTP_SRV_CONF_OFFSET,
231 offsetof(ngx_http_core_srv_conf_t, merge_slashes), 231 offsetof(ngx_http_core_srv_conf_t, merge_slashes),
232 NULL }, 232 NULL },
233 233
234 { ngx_string("underscores_in_headers"),
235 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
236 ngx_conf_set_flag_slot,
237 NGX_HTTP_SRV_CONF_OFFSET,
238 offsetof(ngx_http_core_srv_conf_t, underscores_in_headers),
239 NULL },
240
234 { ngx_string("location"), 241 { ngx_string("location"),
235 NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE12, 242 NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE12,
236 ngx_http_core_location, 243 ngx_http_core_location,
237 NGX_HTTP_SRV_CONF_OFFSET, 244 NGX_HTTP_SRV_CONF_OFFSET,
238 0, 245 0,
2525 cscf->request_pool_size = NGX_CONF_UNSET_SIZE; 2532 cscf->request_pool_size = NGX_CONF_UNSET_SIZE;
2526 cscf->client_header_timeout = NGX_CONF_UNSET_MSEC; 2533 cscf->client_header_timeout = NGX_CONF_UNSET_MSEC;
2527 cscf->client_header_buffer_size = NGX_CONF_UNSET_SIZE; 2534 cscf->client_header_buffer_size = NGX_CONF_UNSET_SIZE;
2528 cscf->ignore_invalid_headers = NGX_CONF_UNSET; 2535 cscf->ignore_invalid_headers = NGX_CONF_UNSET;
2529 cscf->merge_slashes = NGX_CONF_UNSET; 2536 cscf->merge_slashes = NGX_CONF_UNSET;
2537 cscf->underscores_in_headers = NGX_CONF_UNSET;
2530 2538
2531 return cscf; 2539 return cscf;
2532 } 2540 }
2533 2541
2534 2542
2602 2610
2603 ngx_conf_merge_value(conf->ignore_invalid_headers, 2611 ngx_conf_merge_value(conf->ignore_invalid_headers,
2604 prev->ignore_invalid_headers, 1); 2612 prev->ignore_invalid_headers, 1);
2605 2613
2606 ngx_conf_merge_value(conf->merge_slashes, prev->merge_slashes, 1); 2614 ngx_conf_merge_value(conf->merge_slashes, prev->merge_slashes, 1);
2615
2616 ngx_conf_merge_value(conf->underscores_in_headers,
2617 prev->underscores_in_headers, 0);
2607 2618
2608 return NGX_CONF_OK; 2619 return NGX_CONF_OK;
2609 } 2620 }
2610 2621
2611 2622