]> git.kaiwu.me - nginx.git/commit
r3117, r3123, r3229 merge:
authorIgor Sysoev <igor@sysoev.ru>
Mon, 16 Nov 2009 15:00:13 +0000 (15:00 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Mon, 16 Nov 2009 15:00:13 +0000 (15:00 +0000)
commit9a61c9e761a716f5e8ab064dc4cbe784d3efe65a
treec8129c01d246a38457df6d535a2071b8fe8a36c1
parent664ca88d335026bc927d6eb73a7f3a299929b7ef
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
src/core/ngx_string.c
src/core/ngx_string.h
src/http/modules/ngx_http_map_module.c
src/http/modules/ngx_http_referer_module.c
src/http/ngx_http.c
src/http/ngx_http_core_module.c
src/http/ngx_http_request.c