Mercurial > hg > nginx-vendor-current
comparison src/http/ngx_http.c @ 682:5cb5db9975ba NGINX_1_3_4
nginx 1.3.4
*) Change: the "ipv6only" parameter is now turned on by default for
listening IPv6 sockets.
*) Feature: the Clang compiler support.
*) Bugfix: extra listening sockets might be created.
Thanks to Roman Odaisky.
*) Bugfix: nginx/Windows might hog CPU if a worker process failed to
start.
Thanks to Ricardo Villalobos Guevara.
*) Bugfix: the "proxy_pass_header", "fastcgi_pass_header",
"scgi_pass_header", "uwsgi_pass_header", "proxy_hide_header",
"fastcgi_hide_header", "scgi_hide_header", and "uwsgi_hide_header"
directives might be inherited incorrectly.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Tue, 31 Jul 2012 00:00:00 +0400 |
| parents | ad45b044f1e5 |
| children |
comparison
equal
deleted
inserted
replaced
| 681:625501f84a6b | 682:5cb5db9975ba |
|---|---|
| 1611 if (first->opt.wildcard) { | 1611 if (first->opt.wildcard) { |
| 1612 /* a wildcard address must be the last resort, shift it to the end */ | 1612 /* a wildcard address must be the last resort, shift it to the end */ |
| 1613 return 1; | 1613 return 1; |
| 1614 } | 1614 } |
| 1615 | 1615 |
| 1616 if (second->opt.wildcard) { | |
| 1617 /* a wildcard address must be the last resort, shift it to the end */ | |
| 1618 return -1; | |
| 1619 } | |
| 1620 | |
| 1616 if (first->opt.bind && !second->opt.bind) { | 1621 if (first->opt.bind && !second->opt.bind) { |
| 1617 /* shift explicit bind()ed addresses to the start */ | 1622 /* shift explicit bind()ed addresses to the start */ |
| 1618 return -1; | 1623 return -1; |
| 1619 } | 1624 } |
| 1620 | 1625 |