diff options
| author |  Attila Molnar | 2016-08-10 15:57:04 +0200 |
|---|---|---|
| committer | Attila Molnar | 2016-08-10 15:57:04 +0200 |
| commit | 7770cd985405c7630e9149fc08c314ec824a9c75 (patch) | |
| tree | 717c8ed61ec462196d206471899fc47e25c05c59 /src/modules/m_httpd.cpp | |
| parent | Add a method which calculates the maximum mask length. (#1171) (diff) | |
| parent | m_ssl_* Add option to sslprofile controlling whether to request client certif... (diff) | |
Merge branch 'master+websocket'
Diffstat (limited to 'src/modules/m_httpd.cpp')
| -rw-r--r-- | src/modules/m_httpd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index 760647d47..64bef70d1 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -78,8 +78,8 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru { ServerInstance->Timers.AddTimer(this); - if (via->iohookprov) - via->iohookprov->OnAccept(this, client, server); + if ((!via->iohookprovs.empty()) && (via->iohookprovs.back())) + via->iohookprovs.back()->OnAccept(this, client, server); } ~HttpServerSocket() @@ -413,7 +413,7 @@ class ModuleHttpServer : public Module { HttpServerSocket* sock = *i; ++i; - if (sock->GetIOHook() && sock->GetIOHook()->prov->creator == mod) + if (sock->GetModHook(mod)) { sock->cull(); delete sock; |