Mercurial > hg > nginx
comparison src/http/ngx_http_request.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 | 1966ba1d76fd |
children | 612436ad775a |
comparison
equal
deleted
inserted
replaced
3334:52af73f2def5 | 3335:616ff375a68f |
---|---|
1656 goto found; | 1656 goto found; |
1657 } | 1657 } |
1658 | 1658 |
1659 #if (NGX_PCRE) | 1659 #if (NGX_PCRE) |
1660 | 1660 |
1661 if (r->virtual_names->nregex) { | 1661 if (len && r->virtual_names->nregex) { |
1662 size_t ncaptures; | 1662 size_t ncaptures; |
1663 ngx_int_t n; | 1663 ngx_int_t n; |
1664 ngx_uint_t i; | 1664 ngx_uint_t i; |
1665 ngx_str_t name; | 1665 ngx_str_t name; |
1666 ngx_http_server_name_t *sn; | 1666 ngx_http_server_name_t *sn; |