Mercurial > hg > nginx
comparison src/http/modules/ngx_http_map_module.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 | 2efa8d2fcde1 |
children | ac33852faaac |
comparison
equal
deleted
inserted
replaced
3334:52af73f2def5 | 3335:616ff375a68f |
---|---|
335 ngx_hash_key_t *first, *second; | 335 ngx_hash_key_t *first, *second; |
336 | 336 |
337 first = (ngx_hash_key_t *) one; | 337 first = (ngx_hash_key_t *) one; |
338 second = (ngx_hash_key_t *) two; | 338 second = (ngx_hash_key_t *) two; |
339 | 339 |
340 return ngx_strcmp(first->key.data, second->key.data); | 340 return ngx_dns_strcmp(first->key.data, second->key.data); |
341 } | 341 } |
342 | 342 |
343 | 343 |
344 static char * | 344 static char * |
345 ngx_http_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf) | 345 ngx_http_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf) |