Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 3721:c62a2683bfbf
change default server_name_in_redirect value to off,
since default server_name is empty
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 29 Jul 2010 10:01:31 +0000 |
parents | c3a37fc8d1fe |
children | 72cc5b789021 |
comparison
equal
deleted
inserted
replaced
3720:c3a37fc8d1fe | 3721:c62a2683bfbf |
---|---|
3328 } | 3328 } |
3329 | 3329 |
3330 ngx_conf_merge_value(conf->reset_timedout_connection, | 3330 ngx_conf_merge_value(conf->reset_timedout_connection, |
3331 prev->reset_timedout_connection, 0); | 3331 prev->reset_timedout_connection, 0); |
3332 ngx_conf_merge_value(conf->server_name_in_redirect, | 3332 ngx_conf_merge_value(conf->server_name_in_redirect, |
3333 prev->server_name_in_redirect, 1); | 3333 prev->server_name_in_redirect, 0); |
3334 ngx_conf_merge_value(conf->port_in_redirect, prev->port_in_redirect, 1); | 3334 ngx_conf_merge_value(conf->port_in_redirect, prev->port_in_redirect, 1); |
3335 ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1); | 3335 ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1); |
3336 ngx_conf_merge_value(conf->msie_refresh, prev->msie_refresh, 0); | 3336 ngx_conf_merge_value(conf->msie_refresh, prev->msie_refresh, 0); |
3337 ngx_conf_merge_value(conf->log_not_found, prev->log_not_found, 1); | 3337 ngx_conf_merge_value(conf->log_not_found, prev->log_not_found, 1); |
3338 ngx_conf_merge_value(conf->log_subrequest, prev->log_subrequest, 0); | 3338 ngx_conf_merge_value(conf->log_subrequest, prev->log_subrequest, 0); |