Merge from trunk. and Save Comm::Connection in IoCallback

[thirdparty/squid.git] / src / ProtoPort.cc

diff --git a/src/ProtoPort.cc b/src/ProtoPort.cc
index 98d4142a62992876fab889434fe8270f3c67ff77..91064d155eda0baab2ce8a32ee297dad244b6df5 100644 (file)
--- a/src/ProtoPort.cc
+++ b/src/ProtoPort.cc
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #include "squid.h"
 #include "ProtoPort.h"
 #if HAVE_LIMITS
@@ -19,7 +15,8 @@ http_port_list::http_port_list(const char *aProtocol)
 
 http_port_list::~http_port_list()
 {
-    delete listener;
+    if (Comm::IsConnOpen(listenConn))
+        listenConn->close();
 
     safe_free(name);
     safe_free(defaultsite);