diff options
Diffstat (limited to 'src/modules/m_httpd.cpp')
| -rw-r--r-- | src/modules/m_httpd.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
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]; } } |