httpd connection close fixes (these need to be backported to 1.1 at some point?)...

[user/henk/code/inspircd.git] / src / modules / extra / m_ssl_openssl.cpp

diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index ed38933db19a923477949718731e0082a3864f9f..4691b874e439188a82331929dacfb7b002cbe56e 100644 (file)
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -34,13 +34,17 @@
 #endif
 
 /* $ModDesc: Provides SSL support for clients */
-/* $CompileFlags: pkgconfversion("openssl","0.9.7") pkgconfincludes("openssl","/openssl/ssl.h","") */
-/* $LinkerFlags: rpath("pkg-config --libs openssl") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto -ldl") */
+
+/* $LinkerFlags: if("USE_FREEBSD_BASE_SSL") -lssl -lcrypto */
+/* $CompileFlags: if(!"USE_FREEBSD_BASE_SSL") pkgconfversion("openssl","0.9.7") pkgconfincludes("openssl","/openssl/ssl.h","") */
+/* $LinkerFlags: if(!"USE_FREEBSD_BASE_SSL") rpath("pkg-config --libs openssl") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto -ldl") */
+
 /* $ModDep: transport.h */
 /* $NoPedantic */
 /* $CopyInstall: conf/key.pem $(CONPATH) */
 /* $CopyInstall: conf/cert.pem $(CONPATH) */
 
+
 enum issl_status { ISSL_NONE, ISSL_HANDSHAKING, ISSL_OPEN };
 enum issl_io_status { ISSL_WRITE, ISSL_READ };
 
@@ -318,7 +322,7 @@ class ModuleSSLOpenSSL : public Module
                        {
                                // User is using SSL, they're a local user, and they're using one of *our* SSL ports.
                                // Potentially there could be multiple SSL modules loaded at once on different ports.
-                               User::QuitUser(ServerInstance, user, "SSL module unloading");
+                               ServerInstance->Users->QuitUser(user, "SSL module unloading");
                        }
                        if (user->GetExt("ssl_cert", dummy))
                        {