Merge of r4756: fixed listen addresses sorting (ticket #187)

Fixed sorting of listen addresses so that wildcard address is always at
the end.  Failure to do so could result in several listen sockets to be
created instead of only one listening on wildcard address.

Reported by Roman Odaisky.
This commit is contained in:
Maxim Dounin 2012-08-06 16:03:56 +00:00
parent ff331a2988
commit 41e1ea0222
1 changed files with 5 additions and 0 deletions

View File

@ -1613,6 +1613,11 @@ ngx_http_cmp_conf_addrs(const void *one, const void *two)
return 1;
}
if (second->opt.wildcard) {
/* a wildcard address must be the last resort, shift it to the end */
return -1;
}
if (first->opt.bind && !second->opt.bind) {
/* shift explicit bind()ed addresses to the start */
return -1;