mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-28 10:10:39 +08:00
Code Issues Actions 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/http/ngx_http.c
View File

@ -1314,9 +1314,8 @@ ngx_http_optimize_servers(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf,
sizeof(ngx_http_conf_in_addr_t), ngx_http_cmp_conf_in_addrs); sizeof(ngx_http_conf_in_addr_t), ngx_http_cmp_conf_in_addrs);
/* /*
* check whether all name-based servers have the same configuraiton * check whether all name-based servers have
* as the default server, * the same configuraiton as the default server
* or some servers disable optimizing the server names
*/ */
in_addr = in_port[p].addrs.elts; in_addr = in_port[p].addrs.elts;
@ -1325,18 +1324,15 @@ ngx_http_optimize_servers(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf,
name = in_addr[a].names.elts; name = in_addr[a].names.elts;
for (s = 0; s < in_addr[a].names.nelts; s++) { for (s = 0; s < in_addr[a].names.nelts; s++) {
if (in_addr[a].core_srv_conf != name[s].core_srv_conf if (in_addr[a].core_srv_conf != name[s].core_srv_conf) {
|| name[s].core_srv_conf->optimize_server_names == 0)
{
goto virtual_names; goto virtual_names;
} }
} }
/* /*
* if all name-based servers have the same configuration * if all name-based servers have the same configuration
* as the default server, * as the default server, then we do not need to check
* and no servers disable optimizing the server names * them at run-time at all
* then we do not need to check them at run-time at all
*/ */
in_addr[a].names.nelts = 0; in_addr[a].names.nelts = 0;

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 = static ngx_conf_post_handler_pt ngx_http_core_pool_size_p =
ngx_http_core_pool_size; ngx_http_core_pool_size;
static ngx_conf_deprecated_t ngx_conf_deprecated_optimize_host_names = { static ngx_conf_deprecated_t ngx_conf_deprecated_optimize_server_names = {
ngx_conf_deprecated, "optimize_host_names", "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 = { 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_string("optimize_server_names"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot, ngx_conf_set_flag_slot,
NGX_HTTP_SRV_CONF_OFFSET, NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_core_srv_conf_t, optimize_server_names), offsetof(ngx_http_core_loc_conf_t, server_name_in_redirect),
NULL }, &ngx_conf_deprecated_optimize_server_names },
{ 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_string("ignore_invalid_headers"), { ngx_string("ignore_invalid_headers"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, 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->request_pool_size = NGX_CONF_UNSET_SIZE;
cscf->client_header_timeout = NGX_CONF_UNSET_MSEC; cscf->client_header_timeout = NGX_CONF_UNSET_MSEC;
cscf->client_header_buffer_size = NGX_CONF_UNSET_SIZE; cscf->client_header_buffer_size = NGX_CONF_UNSET_SIZE;
cscf->optimize_server_names = NGX_CONF_UNSET;
cscf->ignore_invalid_headers = NGX_CONF_UNSET; cscf->ignore_invalid_headers = NGX_CONF_UNSET;
cscf->merge_slashes = 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; 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, ngx_conf_merge_value(conf->ignore_invalid_headers,
prev->ignore_invalid_headers, 1); prev->ignore_invalid_headers, 1);

1
src/http/ngx_http_core_module.h
View File

@ -150,7 +150,6 @@ typedef struct {
ngx_msec_t client_header_timeout; ngx_msec_t client_header_timeout;
ngx_flag_t optimize_server_names;
ngx_flag_t ignore_invalid_headers; ngx_flag_t ignore_invalid_headers;
ngx_flag_t merge_slashes; ngx_flag_t merge_slashes;