3 files changed, 16 insertions, 10 deletions
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index c356a2154..4a89f9948 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -93,7 +93,7 @@ struct CallerIDExtInfo : public ExtensionItem
 	callerid_data* get(User* user, bool create)
 	{
 		callerid_data* dat = static_cast<callerid_data*>(get_raw(user));
-		if (!dat)
+		if (create && !dat)
 		{
 			dat = new callerid_data;
 			set_raw(user, dat);
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 2991b524e..76e89666a 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -60,10 +60,6 @@ class HttpServerSocket : public BufferedSocket
 		return index;
 	}
 
-	~HttpServerSocket()
-	{
-	}
-
 	virtual void OnError(BufferedSocketError)
 	{
 	}
@@ -347,6 +343,11 @@ class HttpListener : public ListenSocketBase
 		this->index = idx;
 	}
 
+	~HttpListener()
+	{
+		delete index;
+	}
+
 	virtual void OnAcceptReady(int nfd)
 	{
 		int port;
@@ -383,7 +384,10 @@ class ModuleHttpServer : public Module
 			indexfile = c.ReadValue("http", "index", i);
 			index = new FileReader(indexfile);
 			if (!index->Exists())
+			{
+				delete index;
 				throw ModuleException("Can't read index file: "+indexfile);
+			}
 			http = new HttpListener(index, port, bindip);
 			httplisteners.push_back(http);
 		}
@@ -408,14 +412,14 @@ class ModuleHttpServer : public Module
 	{
 		for (size_t i = 0; i < httplisteners.size(); i++)
 		{
+			httplisteners[i]->cull();
 			delete httplisteners[i];
 		}
 
 		for (size_t i = 0; i < httpsocks.size(); i++)
 		{
-			ServerInstance->SE->DelFd(httpsocks[i]);
-			httpsocks[i]->Close();
-			delete httpsocks[i]->GetIndex();
+			httpsocks[i]->cull();
+			delete httpsocks[i];
 		}
 	}
 
diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 58a54f715..3f10bbeb8 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -185,7 +185,7 @@ public:
 		OnRehash(NULL);
 	}
 
-	virtual ~ModulePermanentChannels()
+	CullResult cull()
 	{
 		/*
 		 * DelMode can't remove the +P mode on empty channels, or it will break
@@ -200,12 +200,14 @@ public:
 			{
 				chan_hash::iterator at = iter;
 				iter++;
+				FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(c));
 				ServerInstance->chanlist->erase(at);
-				delete c;
+				ServerInstance->GlobalCulls.AddItem(c);
 			}
 			else
 				iter++;
 		}
+		return Module::cull();
 	}
 
 	virtual void OnRehash(User *user)