diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-11-16 15:00:13 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-11-16 15:00:13 +0000 |
| commit | 9a61c9e761a716f5e8ab064dc4cbe784d3efe65a (patch) | |
| tree | c8129c01d246a38457df6d535a2071b8fe8a36c1 /src/http/ngx_http_request.c | |
| parent | 664ca88d335026bc927d6eb73a7f3a299929b7ef (diff) | |
| download | nginx-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_request.c')
| -rw-r--r-- | src/http/ngx_http_request.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index 13b069226..541d305ec 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -1658,7 +1658,7 @@ ngx_http_find_virtual_server(ngx_http_request_t *r, u_char *host, size_t len) #if (NGX_PCRE) - if (r->virtual_names->nregex) { + if (len && r->virtual_names->nregex) { size_t ncaptures; ngx_int_t n; ngx_uint_t i; |