Mercurial > hg > nginx-vendor-current

diff src/http/ngx_http.c @ 180:4cd3e70c4d60 NGINX_0_3_37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.3.37 *) Feature: the "limit_except" directive. *) Feature: the "if" directive supports the "!~", "!~*", "-f", and "!-f" operators. *) Feature: the ngx_http_perl_module supports the $r->request_body method. *) Bugfix: in the ngx_http_addition_filter_module.
author Igor Sysoev <http://sysoev.ru>
date Fri, 07 Apr 2006 00:00:00 +0400
parents 4ad13ee5ef5e
children 54aabf2b0bc6
line wrap: on
line diff
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -595,8 +595,8 @@ ngx_http_block(ngx_conf_t *cf, ngx_comma
 
                 if (rc == NGX_BUSY) {
                     ngx_log_error(NGX_LOG_WARN, cf->log, 0,
-                                  "conflicting server name \"%V\", ignored",
-                                  &name[s].name);
+                                "conflicting server name \"%V\" on %s, ignored",
+                                &name[s].name, in_addr[a].listen_conf->addr);
                 }
             }
 
@@ -617,8 +617,8 @@ ngx_http_block(ngx_conf_t *cf, ngx_comma
 
                 if (rc == NGX_BUSY) {
                     ngx_log_error(NGX_LOG_WARN, cf->log, 0,
-                                  "conflicting server name \"%V\", ignored",
-                                  &name[s].name);
+                                "conflicting server name \"%V\" on %s, ignored",
+                                &name[s].name, in_addr[a].listen_conf->addr);
                 }
             }