diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-04-07 14:08:04 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-04-07 14:08:04 +0000 |
| commit | 94e32ce7f885ecc648ae6377276f8813fc1c9347 (patch) | |
| tree | 88da0722e206c60326b466b85ab118c00be13f55 /src/http/ngx_http.c | |
| parent | 7469680c6c32901e7b6082a0e564430b587bbcfa (diff) | |
| download | nginx-94e32ce7f885ecc648ae6377276f8813fc1c9347.tar.gz nginx-94e32ce7f885ecc648ae6377276f8813fc1c9347.zip | |
nginx-0.3.37-RELEASE importrelease-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.
Diffstat (limited to 'src/http/ngx_http.c')
| -rw-r--r-- | src/http/ngx_http.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index b50d580c5..5a23d1dbb 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -595,8 +595,8 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) 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_command_t *cmd, void *conf) 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); } } |