------------------------------------------------------------
revno: 12420
revision-id: squid3@treenet.co.nz-20121129103843-pcr947v744puqt15
parent: squid3@treenet.co.nz-20121129103807-y4pu52dw0mji6kr7
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Thu 2012-11-29 03:38:43 -0700
message:
  Fix accept_filter on Linux
  
  accept_filter directive on Linux requires TCP_DEFER_ACCEPT which
  in turn requires netinet/tcp.h. This was removed when splitting comm
  into libcomm.la.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20121129103843-pcr947v744puqt15
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: d7d3f8866efdc0afb2d26f56ce9a01ee34f840ce
# timestamp: 2012-11-29 10:40:33 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20121129103807-\
#   y4pu52dw0mji6kr7
# 
# Begin patch
=== modified file 'src/comm/TcpAcceptor.cc'
--- src/comm/TcpAcceptor.cc	2012-09-04 09:10:20 +0000
+++ src/comm/TcpAcceptor.cc	2012-11-29 10:38:43 +0000
@@ -53,11 +53,12 @@
 #if HAVE_ERRNO_H
 #include <errno.h>
 #endif
+#ifdef HAVE_NETINET_TCP_H
+// required for accept_filter to build.
+#include <netinet/tcp.h>
+#endif
 
-namespace Comm
-{
-CBDATA_CLASS_INIT(TcpAcceptor);
-};
+CBDATA_NAMESPACED_CLASS_INIT(Comm, TcpAcceptor);
 
 Comm::TcpAcceptor::TcpAcceptor(const Comm::ConnectionPointer &newConn, const char *note, const Subscription::Pointer &aSub) :
         AsyncJob("Comm::TcpAcceptor"),