Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 2029:c036922f6f07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*) remove optimize_host_names *) deprecate optimize_server_names: it is not needed since server_name_in_redirect introduction
author Igor Sysoev <igor@sysoev.ru>
date Sat, 24 May 2008 15:43:48 +0000
parents f321b59ae0e9
children 1d86674d1286
comparison
equal deleted inserted replaced
2028:bff8689c6953 2029:c036922f6f07
77 { ngx_http_core_lowat_check }; 77 { ngx_http_core_lowat_check };
78 78
79 static ngx_conf_post_handler_pt ngx_http_core_pool_size_p = 79 static ngx_conf_post_handler_pt ngx_http_core_pool_size_p =
80 ngx_http_core_pool_size; 80 ngx_http_core_pool_size;
81 81
82 static ngx_conf_deprecated_t ngx_conf_deprecated_optimize_host_names = { 82 static ngx_conf_deprecated_t ngx_conf_deprecated_optimize_server_names = {
83 ngx_conf_deprecated, "optimize_host_names", "optimize_server_names" 83 ngx_conf_deprecated, "optimize_server_names", "server_name_in_redirect"
84 }; 84 };
85 85
86 static ngx_conf_deprecated_t ngx_conf_deprecated_open_file_cache_retest = { 86 static ngx_conf_deprecated_t ngx_conf_deprecated_open_file_cache_retest = {
87 ngx_conf_deprecated, "open_file_cache_retest", "open_file_cache_valid" 87 ngx_conf_deprecated, "open_file_cache_retest", "open_file_cache_valid"
88 }; 88 };
210 NULL }, 210 NULL },
211 211
212 { ngx_string("optimize_server_names"), 212 { ngx_string("optimize_server_names"),
213 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, 213 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
214 ngx_conf_set_flag_slot, 214 ngx_conf_set_flag_slot,
215 NGX_HTTP_SRV_CONF_OFFSET, 215 NGX_HTTP_LOC_CONF_OFFSET,
216 offsetof(ngx_http_core_srv_conf_t, optimize_server_names), 216 offsetof(ngx_http_core_loc_conf_t, server_name_in_redirect),
217 NULL }, 217 &ngx_conf_deprecated_optimize_server_names },
218
219 { ngx_string("optimize_host_names"),
220 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
221 ngx_conf_set_flag_slot,
222 NGX_HTTP_SRV_CONF_OFFSET,
223 offsetof(ngx_http_core_srv_conf_t, optimize_server_names),
224 &ngx_conf_deprecated_optimize_host_names },
225 218
226 { ngx_string("ignore_invalid_headers"), 219 { ngx_string("ignore_invalid_headers"),
227 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, 220 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
228 ngx_conf_set_flag_slot, 221 ngx_conf_set_flag_slot,
229 NGX_HTTP_SRV_CONF_OFFSET, 222 NGX_HTTP_SRV_CONF_OFFSET,
2417 2410
2418 cscf->connection_pool_size = NGX_CONF_UNSET_SIZE; 2411 cscf->connection_pool_size = NGX_CONF_UNSET_SIZE;
2419 cscf->request_pool_size = NGX_CONF_UNSET_SIZE; 2412 cscf->request_pool_size = NGX_CONF_UNSET_SIZE;
2420 cscf->client_header_timeout = NGX_CONF_UNSET_MSEC; 2413 cscf->client_header_timeout = NGX_CONF_UNSET_MSEC;
2421 cscf->client_header_buffer_size = NGX_CONF_UNSET_SIZE; 2414 cscf->client_header_buffer_size = NGX_CONF_UNSET_SIZE;
2422 cscf->optimize_server_names = NGX_CONF_UNSET;
2423 cscf->ignore_invalid_headers = NGX_CONF_UNSET; 2415 cscf->ignore_invalid_headers = NGX_CONF_UNSET;
2424 cscf->merge_slashes = NGX_CONF_UNSET; 2416 cscf->merge_slashes = NGX_CONF_UNSET;
2425 2417
2426 return cscf; 2418 return cscf;
2427 } 2419 }
2492 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 2484 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
2493 "the \"large_client_header_buffers\" size must be " 2485 "the \"large_client_header_buffers\" size must be "
2494 "equal to or bigger than \"connection_pool_size\""); 2486 "equal to or bigger than \"connection_pool_size\"");
2495 return NGX_CONF_ERROR; 2487 return NGX_CONF_ERROR;
2496 } 2488 }
2497
2498 ngx_conf_merge_value(conf->optimize_server_names,
2499 prev->optimize_server_names, 1);
2500 2489
2501 ngx_conf_merge_value(conf->ignore_invalid_headers, 2490 ngx_conf_merge_value(conf->ignore_invalid_headers,
2502 prev->ignore_invalid_headers, 1); 2491 prev->ignore_invalid_headers, 1);
2503 2492
2504 ngx_conf_merge_value(conf->merge_slashes, prev->merge_slashes, 1); 2493 ngx_conf_merge_value(conf->merge_slashes, prev->merge_slashes, 1);