summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2010-07-29 10:01:31 +0000
committerIgor Sysoev <igor@sysoev.ru>2010-07-29 10:01:31 +0000
commit7c50789e2adf4b6d0df15be1a76911f327fad535 (patch)
tree75f580e9e808bf4740a1cd886f783b84b6b3e830 /src
parenta69cf2d005111f785de5ad3362ba6c616a7aef5d (diff)
downloadnginx-7c50789e2adf4b6d0df15be1a76911f327fad535.tar.gz
nginx-7c50789e2adf4b6d0df15be1a76911f327fad535.tar.bz2
change default server_name_in_redirect value to off,
since default server_name is empty
Diffstat (limited to 'src')
-rw-r--r--src/http/ngx_http_core_module.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index f4d0aae04..356e64810 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -3330,7 +3330,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_value(conf->reset_timedout_connection,
prev->reset_timedout_connection, 0);
ngx_conf_merge_value(conf->server_name_in_redirect,
- prev->server_name_in_redirect, 1);
+ prev->server_name_in_redirect, 0);
ngx_conf_merge_value(conf->port_in_redirect, prev->port_in_redirect, 1);
ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1);
ngx_conf_merge_value(conf->msie_refresh, prev->msie_refresh, 0);