Do not ApplyTcpKeepAlive() to PortCfg-unrelated traffic (#1006)

diff --git a/src/comm/TcpAcceptor.cc b/src/comm/TcpAcceptor.cc
index 8aa57a9d1e02c3a51b5e8d7ba23f953629b6a908..b27f0ac96b28ee2450219073c5b8287c726925b3 100644 (file)
--- a/src/comm/TcpAcceptor.cc
+++ b/src/comm/TcpAcceptor.cc
@@ -426,7 +426,8 @@ Comm::TcpAcceptor::oldAccept(Comm::ConnectionPointer &details)
     // set socket flags
     commSetCloseOnExec(sock);
     commSetNonBlocking(sock);
-    Comm::ApplyTcpKeepAlive(sock, listenPort_->tcp_keepalive);
+    if (listenPort_)
+        Comm::ApplyTcpKeepAlive(sock, listenPort_->tcp_keepalive);
 
     /* IFF the socket is (tproxy) transparent, pass the flag down to allow spoofing */
     F->flags.transparent = fd_table[conn->fd].flags.transparent; // XXX: can we remove this line yet?