diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-05-24 15:43:48 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-05-24 15:43:48 +0000 |
| commit | 5cdb2ce66e4eda3eb79e032639fd7fc1d815b8db (patch) | |
| tree | 2d8e96a93cb2f2a259a1d0837e58c9baf6845999 /src/http/ngx_http_core_module.c | |
| parent | 7e2c4eef9c2439a7c743a303305ecba616b7b376 (diff) | |
| download | nginx-5cdb2ce66e4eda3eb79e032639fd7fc1d815b8db.tar.gz nginx-5cdb2ce66e4eda3eb79e032639fd7fc1d815b8db.zip | |
*) remove optimize_host_names
*) deprecate optimize_server_names: it is not needed since
server_name_in_redirect introduction
Diffstat (limited to 'src/http/ngx_http_core_module.c')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index e0f1e1f90..76d40ea0f 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -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); |