4 files changed, 9 insertions, 1 deletions
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 8494863a3..0e06f5363 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -405,9 +405,10 @@ class ModuleHttpServer : public Module
 		for (size_t i = 0; i < httpsocks.size(); i++)
 		{
 			ServerInstance->SE->DelFd(httpsocks[i]);
+			httpsocks[i]->Close();
 			delete httpsocks[i]->GetIndex();
-			delete httpsocks[i];
 		}
+		ServerInstance->InspSocketCull();
 	}
 
 	virtual Version GetVersion()
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 4d960cf8a..c987cb590 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -212,6 +212,9 @@ void TreeSocket::OnError(InspSocketError e)
 {
 	Link* MyLink;
 
+	if (this->LinkState == LISTENER)
+		return;
+
 	switch (e)
 	{
 		case I_ERR_CONNECT:
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index dcfb2b4aa..23362ca99 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -1501,6 +1501,9 @@ void TreeSocket::OnTimeout()
 
 void TreeSocket::OnClose()
 {
+	if (this->LinkState == LISTENER)
+		return;
+
 	// Connection closed.
 	// If the connection is fully up (state CONNECTED)
 	// then propogate a netsplit to all peers.
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 9d4fbf41a..bfd46ef03 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -202,6 +202,7 @@ SpanningTreeUtilities::~SpanningTreeUtilities()
 		}
 	}
 	delete TreeRoot;
+	ServerInstance->InspSocketCull();
 }
 
 void SpanningTreeUtilities::AddThisServer(TreeServer* server, TreeServerList &list)