--------------------- PatchSet 4897 Date: 2007/06/29 15:49:01 Author: amosjeffries Branch: squid3-ipv6 Tag: (none) Log: Fix: setting http_port [ip]:port ignores the specified port. Setting host via some methods (hostent, addrinfo, sockaddr) overwrites port The squid.conf parser was saving details backwards regarding the usage. Members: src/cache_cf.cc:1.40.2.31->1.40.2.32 Index: squid3/src/cache_cf.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/cache_cf.cc,v retrieving revision 1.40.2.31 retrieving revision 1.40.2.32 diff -u -r1.40.2.31 -r1.40.2.32 --- squid3/src/cache_cf.cc 8 Jun 2007 13:29:10 -0000 1.40.2.31 +++ squid3/src/cache_cf.cc 29 Jun 2007 15:49:01 -0000 1.40.2.32 @@ -1,6 +1,6 @@ /* - * $Id: cache_cf.cc,v 1.40.2.31 2007/06/08 13:29:10 amosjeffries Exp $ + * $Id: cache_cf.cc,v 1.40.2.32 2007/06/29 15:49:01 amosjeffries Exp $ * * DEBUG: section 3 Configuration File Parsing * AUTHOR: Harvest Derived @@ -2653,8 +2653,6 @@ if (port == 0) self_destruct(); - s->s.SetPort(port); - if (NULL == host) s->s.SetAnyAddr(); else if ( s->s = host) @@ -2665,6 +2663,8 @@ s->defaultsite = xstrdup(host); } else self_destruct(); + + s->s.SetPort(port); } static void