Mercurial > hg > nginx
comparison src/http/ngx_http.c @ 3335:616ff375a68f stable-0.7
r3117, r3123, r3229 merge:
server name related merges:
*) If .domain.com, .sub.domain.com, and .domain-some.com were defined,
then .sub.domain.com was matched by .domain.com: wildcard names hash
was built incorrectly due to sorting order issue of "." vs "-".
They were sorted as
com.domain com.domain-some com.domain.sub
while they should be sorted as
com.domain com.domain.sub com.domain-some
for correct hash building
*) test space between "~" and regex in server_name and invalid_referers
*) do not run regex for empty host name since regex always fails in this case,
the bug had been introduced in r2196
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 16 Nov 2009 15:00:13 +0000 |
| parents | dfe04af9d30b |
| children | a22bf524a456 935c5eb13c7d |
comparison
equal
deleted
inserted
replaced
| 3334:52af73f2def5 | 3335:616ff375a68f |
|---|---|
| 1599 ngx_hash_key_t *first, *second; | 1599 ngx_hash_key_t *first, *second; |
| 1600 | 1600 |
| 1601 first = (ngx_hash_key_t *) one; | 1601 first = (ngx_hash_key_t *) one; |
| 1602 second = (ngx_hash_key_t *) two; | 1602 second = (ngx_hash_key_t *) two; |
| 1603 | 1603 |
| 1604 return ngx_strcmp(first->key.data, second->key.data); | 1604 return ngx_dns_strcmp(first->key.data, second->key.data); |
| 1605 } | 1605 } |
| 1606 | 1606 |
| 1607 | 1607 |
| 1608 static ngx_int_t | 1608 static ngx_int_t |
| 1609 ngx_http_init_listening(ngx_conf_t *cf, ngx_http_conf_port_t *port) | 1609 ngx_http_init_listening(ngx_conf_t *cf, ngx_http_conf_port_t *port) |