# HG changeset patch # User Igor Sysoev # Date 1256206674 0 # Node ID a632dc9f3e7311cc1d07c41300ebe670a4b07d37 # Parent 1e1e66ef3a4052861548e8aa2fa5a90ca17f567d fix r3225 and r3227: preserve default_server bit during listen options overwriting diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1167,7 +1167,7 @@ ngx_http_add_addresses(ngx_conf_t *cf, n { u_char *p; size_t len, off; - ngx_uint_t i; + ngx_uint_t i, default_server; struct sockaddr *sa; ngx_http_conf_addr_t *addr; @@ -1209,6 +1209,9 @@ ngx_http_add_addresses(ngx_conf_t *cf, n return NGX_ERROR; } + /* preserve default_server bit during listen options overwriting */ + default_server = addr[i].opt.default_server; + if (lsopt->set) { if (addr[i].opt.set) { @@ -1224,15 +1227,18 @@ ngx_http_add_addresses(ngx_conf_t *cf, n if (lsopt->default_server) { - if (addr[i].opt.default_server) { + if (default_server) { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "a duplicate default server for %s", addr[i].opt.addr); return NGX_ERROR; } + default_server = 1; addr[i].default_server = cscf; } + addr[i].opt.default_server = default_server; + return NGX_OK; }