From: Igor Sysoev <igor@sysoev.ru>
Date: Thu, 29 Jul 2010 10:01:31 +0000 (+0000)
Subject: change default server_name_in_redirect value to off,
X-Git-Tag: release-0.8.48~17
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=7c50789e2adf4b6d0df15be1a76911f327fad535;p=nginx.git

change default server_name_in_redirect value to off,
since default server_name is empty
---

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);