From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Fri, 14 May 2010 01:08:15 +0000 (+0200)
Subject: Correct F->sock_family setting on accept sockets, ipv6/ipv4 compile condition was... 
X-Git-Tag: SQUID_3_1_4~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d738bf5d186f02fb95682a2b088dd208c7f37db;p=thirdparty%2Fsquid.git

Correct F->sock_family setting on accept sockets, ipv6/ipv4 compile condition was reversed
---

diff --git a/src/comm.cc b/src/comm.cc
index 3128c2e73f..ebaf35d12d 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1424,9 +1424,9 @@ comm_old_accept(int fd, ConnectionDetail &details)
     F->remote_port = details.peer.GetPort();
     F->local_addr.SetPort(details.me.GetPort());
 #if USE_IPV6
-    F->sock_family = AF_INET;
-#else
     F->sock_family = details.me.IsIPv4()?AF_INET:AF_INET6;
+#else
+    F->sock_family = AF_INET;
 #endif
     details.me.FreeAddrInfo(gai);