summaryrefslogtreecommitdiffhomepage
path: root/src/http/ngx_http.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-11-16 15:00:13 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-11-16 15:00:13 +0000
commit9a61c9e761a716f5e8ab064dc4cbe784d3efe65a (patch)
treec8129c01d246a38457df6d535a2071b8fe8a36c1 /src/http/ngx_http.c
parent664ca88d335026bc927d6eb73a7f3a299929b7ef (diff)
downloadnginx-9a61c9e761a716f5e8ab064dc4cbe784d3efe65a.tar.gz
nginx-9a61c9e761a716f5e8ab064dc4cbe784d3efe65a.tar.bz2
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
Diffstat (limited to 'src/http/ngx_http.c')
-rw-r--r--src/http/ngx_http.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index b0915157c..f5cb430fa 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1601,7 +1601,7 @@ ngx_http_cmp_dns_wildcards(const void *one, const void *two)
first = (ngx_hash_key_t *) one;
second = (ngx_hash_key_t *) two;
- return ngx_strcmp(first->key.data, second->key.data);
+ return ngx_dns_strcmp(first->key.data, second->key.data);
}