IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

*) remove optimize_host_names

Browse Source 
*) deprecate optimize_server_names: it is not needed since
   server_name_in_redirect introduction
This commit is contained in:
Igor Sysoev
2008-05-24 15:43:48 +00:00
parent 7e2c4eef9c
commit 5cdb2ce66e
3 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/http/ngx_http_core_module.c
View File

@@ -79,8 +79,8 @@ static ngx_conf_post_t ngx_http_core_lowat_post =
static ngx_conf_post_handler_pt ngx_http_core_pool_size_p =
ngx_http_core_pool_size;
static ngx_conf_deprecated_t ngx_conf_deprecated_optimize_host_names = {
ngx_conf_deprecated, "optimize_host_names", "optimize_server_names"
static ngx_conf_deprecated_t ngx_conf_deprecated_optimize_server_names = {
ngx_conf_deprecated, "optimize_server_names", "server_name_in_redirect"
};
static ngx_conf_deprecated_t ngx_conf_deprecated_open_file_cache_retest = {
@@ -212,16 +212,9 @@ static ngx_command_t ngx_http_core_commands[] = {
{ ngx_string("optimize_server_names"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
NGX_HTTP_SRV_CONF_OFFSET,
offsetof(ngx_http_core_srv_conf_t, optimize_server_names),
NULL },
{ ngx_string("optimize_host_names"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
NGX_HTTP_SRV_CONF_OFFSET,
offsetof(ngx_http_core_srv_conf_t, optimize_server_names),
&ngx_conf_deprecated_optimize_host_names },
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_core_loc_conf_t, server_name_in_redirect),
&ngx_conf_deprecated_optimize_server_names },
{ ngx_string("ignore_invalid_headers"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
@@ -2419,7 +2412,6 @@ ngx_http_core_create_srv_conf(ngx_conf_t *cf)
cscf->request_pool_size = NGX_CONF_UNSET_SIZE;
cscf->client_header_timeout = NGX_CONF_UNSET_MSEC;
cscf->client_header_buffer_size = NGX_CONF_UNSET_SIZE;
cscf->optimize_server_names = NGX_CONF_UNSET;
cscf->ignore_invalid_headers = NGX_CONF_UNSET;
cscf->merge_slashes = NGX_CONF_UNSET;
@@ -2495,9 +2487,6 @@ ngx_http_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
return NGX_CONF_ERROR;
}
ngx_conf_merge_value(conf->optimize_server_names,
prev->optimize_server_names, 1);
ngx_conf_merge_value(conf->ignore_invalid_headers,
prev->ignore_invalid_headers, 1);