Mercurial > hg > nginx

comparison src/http/ngx_http.c @ 3226:4872f86df719

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix r3225: it overrode the listen options by default server default options
author Igor Sysoev <igor@sysoev.ru>
date Thu, 22 Oct 2009 08:14:02 +0000
parents 8e76e636ae3b
children a610008bdc1a
comparison
equal deleted inserted replaced
3225:f649453396f5 3226:4872f86df719
1207 1207
1208 if (ngx_http_add_server(cf, cscf, &addr[i]) != NGX_OK) { 1208 if (ngx_http_add_server(cf, cscf, &addr[i]) != NGX_OK) {
1209 return NGX_ERROR; 1209 return NGX_ERROR;
1210 } 1210 }
1211 1211
1212 if (lsopt->set && addr[i].opt.set) { 1212 if (lsopt->set) {
1213 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 1213
1214 if (addr[i].opt.set) {
1215 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
1214 "a duplicate listen options for %s", addr[i].opt.addr); 1216 "a duplicate listen options for %s", addr[i].opt.addr);
1215 return NGX_ERROR; 1217 return NGX_ERROR;
1218 }
1219
1220 addr[i].opt = *lsopt;
1216 } 1221 }
1217 1222
1218 /* check the duplicate "default" server for this address:port */ 1223 /* check the duplicate "default" server for this address:port */
1219 1224
1220 if (lsopt->default_server) { 1225 if (lsopt->default_server) {
1223 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 1228 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
1224 "a duplicate default server for %s", addr[i].opt.addr); 1229 "a duplicate default server for %s", addr[i].opt.addr);
1225 return NGX_ERROR; 1230 return NGX_ERROR;
1226 } 1231 }
1227 1232
1228 addr[i].opt = *lsopt;
1229 addr[i].default_server = cscf; 1233 addr[i].default_server = cscf;
1230 } 1234 }
1231 1235
1232 return NGX_OK; 1236 return NGX_OK;
1233 } 1237 }