[nginx] svn commit: r4756 - trunk/src/http

[ru at nginx.com]

Author: ru
Date: 2012-07-17 04:47:34 +0000 (Tue, 17 Jul 2012)
New Revision: 4756
URL: http://trac.nginx.org/nginx/changeset/4756/nginx

Log:
Fixed sorting of listen addresses so that wildcard address is always at
the end (closes #187).  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.


Modified:
   trunk/src/http/ngx_http.c

Modified: trunk/src/http/ngx_http.c
===================================================================
--- trunk/src/http/ngx_http.c	2012-07-17 04:42:38 UTC (rev 4755)
+++ trunk/src/http/ngx_http.c	2012-07-17 04:47:34 UTC (rev 4756)
@@ -1613,6 +1613,11 @@
         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;