mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix r3225 and r3227: preserve default_server bit during listen options

Browse Source 
overwriting
This commit is contained in:
Igor Sysoev 2009-10-22 10:17:54 +00:00
parent 663e957957
commit 657b3b7f7d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/http/ngx_http.c
View File

@ -1167,7 +1167,7 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
{ {
u_char *p; u_char *p;
size_t len, off; size_t len, off;
ngx_uint_t i; ngx_uint_t i, default_server;
struct sockaddr *sa; struct sockaddr *sa;
ngx_http_conf_addr_t *addr; ngx_http_conf_addr_t *addr;
@ -1209,6 +1209,9 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
return NGX_ERROR; return NGX_ERROR;
} }
/* preserve default_server bit during listen options overwriting */
default_server = addr[i].opt.default_server;
if (lsopt->set) { if (lsopt->set) {
if (addr[i].opt.set) { if (addr[i].opt.set) {
@ -1224,15 +1227,18 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
if (lsopt->default_server) { if (lsopt->default_server) {
if (addr[i].opt.default_server) { if (default_server) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"a duplicate default server for %s", addr[i].opt.addr); "a duplicate default server for %s", addr[i].opt.addr);
return NGX_ERROR; return NGX_ERROR;
} }
default_server = 1;
addr[i].default_server = cscf; addr[i].default_server = cscf;
} }
addr[i].opt.default_server = default_server;
return NGX_OK; return NGX_OK;
} }