commit 2f8c1b73b8a6ba05219fa2e3643f1a4f42308043
author Ruslan Ermilov <ru@nginx.com> Mon Dec 17 09:44:46 2012 +0000
committer Ruslan Ermilov <ru@nginx.com> Mon Dec 17 09:44:46 2012 +0000
tree 476b8dca6aaabe77100ebdcc4ac4e92b9544ec2a
parent bbf7043fe7a4c9adb23586ea18605efa124c564c

Fixed URL parsing code.

The URL parsing code is not expected to initialize port from default port
when in "no_resolve" mode.  This got broken in r4671 for the case of IPv6
literals.

src/core/ngx_inet.c

diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index ea27fad..1fd1691 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -828,6 +828,11 @@
 
         } else {
             u->no_port = 1;
+
+            if (!u->no_resolve) {
+                u->port = u->default_port;
+                sin6->sin6_port = htons(u->default_port);
+            }
         }
     }
 
@@ -850,11 +855,6 @@
         u->wildcard = 1;
     }
 
-    if (u->no_port) {
-        u->port = u->default_port;
-        sin6->sin6_port = htons(u->default_port);
-    }
-
     u->family = AF_INET6;
     u->naddrs = 1;