Mercurial > hg > nginx
comparison src/http/ngx_http.c @ 631:5d2b8078c1c2 release-0.3.37
nginx-0.3.37-RELEASE import
*) 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 <igor@sysoev.ru> |
---|---|
date | Fri, 07 Apr 2006 14:08:04 +0000 |
parents | 93e85a79757c |
children | e60fe4cf1d4e |
comparison
equal
deleted
inserted
replaced
630:375dab4fd227 | 631:5d2b8078c1c2 |
---|---|
593 return NGX_CONF_ERROR; | 593 return NGX_CONF_ERROR; |
594 } | 594 } |
595 | 595 |
596 if (rc == NGX_BUSY) { | 596 if (rc == NGX_BUSY) { |
597 ngx_log_error(NGX_LOG_WARN, cf->log, 0, | 597 ngx_log_error(NGX_LOG_WARN, cf->log, 0, |
598 "conflicting server name \"%V\", ignored", | 598 "conflicting server name \"%V\" on %s, ignored", |
599 &name[s].name); | 599 &name[s].name, in_addr[a].listen_conf->addr); |
600 } | 600 } |
601 } | 601 } |
602 | 602 |
603 for (s = 0; s < in_addr[a].names.nelts; s++) { | 603 for (s = 0; s < in_addr[a].names.nelts; s++) { |
604 | 604 |
615 return NGX_CONF_ERROR; | 615 return NGX_CONF_ERROR; |
616 } | 616 } |
617 | 617 |
618 if (rc == NGX_BUSY) { | 618 if (rc == NGX_BUSY) { |
619 ngx_log_error(NGX_LOG_WARN, cf->log, 0, | 619 ngx_log_error(NGX_LOG_WARN, cf->log, 0, |
620 "conflicting server name \"%V\", ignored", | 620 "conflicting server name \"%V\" on %s, ignored", |
621 &name[s].name); | 621 &name[s].name, in_addr[a].listen_conf->addr); |
622 } | 622 } |
623 } | 623 } |
624 | 624 |
625 hash.key = ngx_hash_key_lc; | 625 hash.key = ngx_hash_key_lc; |
626 hash.max_size = cmcf->server_names_hash_max_size; | 626 hash.max_size = cmcf->server_names_hash_max_size; |