m_override now has a 'requirekey' option, that requires a special key of 'override...

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

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index efae473d99d11d3d2317dc5e275ac5653152abef..ebf57eb3078c7ba40aa250df69bdf12105c49433 100644 (file)
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -270,7 +270,7 @@ class HttpServerSocket : public BufferedSocket
 
        virtual bool OnDataReady()
        {
-               char* data = this->Read();
+               const char* data = this->Read();
 
                /* Check that the data read is a valid pointer and it has some content */
                if (!data || !*data)
@@ -290,7 +290,7 @@ class HttpServerSocket : public BufferedSocket
                        
                        if (reqbuffer.length() >= 8192)
                        {
-                               Instance->Log(DEBUG, "m_httpd dropped connection due to an oversized request buffer");
+                               Instance->Logs->Log("m_httpd",DEBUG, "m_httpd dropped connection due to an oversized request buffer");
                                reqbuffer.clear();
                                return false;
                        }
@@ -478,7 +478,7 @@ class ModuleHttpServer : public Module
                ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       char* OnRequest(Request* request)
+       virtual const char* OnRequest(Request* request)
        {
                claimed = true;
                HTTPDocument* doc = (HTTPDocument*)request->GetData();
@@ -501,7 +501,7 @@ class ModuleHttpServer : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
+               return Version(1,2,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
        }
 };