Mercurial > hg > nginx
comparison src/http/ngx_http.c @ 1533:9b10ba85b249 stable-0.5
r1490 merge:
u_char* is enough to keep file name
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sun, 23 Sep 2007 19:29:22 +0000 |
parents | bf5b86d5f00e |
children | cacb565c554e |
comparison
equal
deleted
inserted
replaced
1532:44bd4db45b30 | 1533:9b10ba85b249 |
---|---|
549 | 549 |
550 if (lscf[l].conf.default_server) { | 550 if (lscf[l].conf.default_server) { |
551 | 551 |
552 if (in_addr[a].default_server) { | 552 if (in_addr[a].default_server) { |
553 ngx_log_error(NGX_LOG_ERR, cf->log, 0, | 553 ngx_log_error(NGX_LOG_ERR, cf->log, 0, |
554 "the duplicate default server in %V:%d", | 554 "the duplicate default server in %s:%ui", |
555 &lscf[l].file_name, lscf[l].line); | 555 &lscf[l].file_name, lscf[l].line); |
556 | 556 |
557 return NGX_CONF_ERROR; | 557 return NGX_CONF_ERROR; |
558 } | 558 } |
559 | 559 |
560 in_addr[a].core_srv_conf = cscfp[s]; | 560 in_addr[a].core_srv_conf = cscfp[s]; |