So much stuff changed in this one, i forgot most of it.

[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 dc6a7f4185ab7b0074cb42825a9adcd5434e63f3..fb9ea954c68d8ce5cf912daadc7ac19eb792f581 100644 (file)
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -22,12 +22,15 @@ using namespace std;
 #include "modules.h"
 #include "inspsocket.h"
 #include "helperfuncs.h"
+#include "inspircd.h"
 #include "httpd.h"
 
 /* $ModDesc: Provides HTTP serving facilities to modules */
 
 class ModuleHttp;
 
+extern InspIRCd* ServerInstance;
+
 static Server *Srv;
 static ModuleHttp* HttpModule;
 extern time_t TIME;
@@ -48,13 +51,13 @@ class HttpSocket : public InspSocket
 
  public:
 
-       HttpSocket(std::string host, int port, bool listening, unsigned long maxtime, FileReader* index_page) : InspSocket(host, port, listening, maxtime), index(index_page)
+       HttpSocket(InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime, FileReader* index_page) : InspSocket(SI, host, port, listening, maxtime), index(index_page)
        {
                log(DEBUG,"HttpSocket constructor");
                InternalState = HTTP_LISTEN;
        }
 
-       HttpSocket(int newfd, char* ip, FileReader* ind) : InspSocket(newfd, ip), index(ind)
+       HttpSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : InspSocket(SI, newfd, ip), index(ind)
        {
                InternalState = HTTP_SERVE_WAIT_REQUEST;
        }
@@ -63,7 +66,7 @@ class HttpSocket : public InspSocket
        {
                if (InternalState == HTTP_LISTEN)
                {
-                       HttpSocket* s = new HttpSocket(newsock, ip, index);
+                       HttpSocket* s = new HttpSocket(this->Instance, newsock, ip, index);
                        Srv->AddSocket(s);
                }
                return true;
@@ -164,13 +167,21 @@ class HttpSocket : public InspSocket
                }
        }
 
-       void SendHeaders(unsigned long size, int response)
+       void SendHeaders(unsigned long size, int response, const std::string &extraheaders)
        {
                struct tm *timeinfo = localtime(&TIME);
                this->Write("HTTP/1.1 "+ConvToStr(response)+" "+Response(response)+"\r\nDate: ");
                this->Write(asctime(timeinfo));
+               if (extraheaders.empty())
+               {
+                       this->Write("Content-Type: text/html\r\n");
+               }
+               else
+               {
+                       this->Write(extraheaders);
+               }
                this->Write("Server: InspIRCd/m_httpd.so/1.1\r\nContent-Length: "+ConvToStr(size)+
-                               "\r\nConnection: close\r\nContent-Type: text/html\r\n\r\n");
+                               "\r\nConnection: close\r\n\r\n");
        }
 
        virtual bool OnDataReady()
@@ -196,13 +207,13 @@ class HttpSocket : public InspSocket
 
                                if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0"))
                                {
-                                       SendHeaders(0, 505);
+                                       SendHeaders(0, 505, "");
                                }
                                else
                                {
                                        if ((request_type == "GET") && (uri == "/"))
                                        {
-                                               SendHeaders(index->ContentSize(),200);
+                                               SendHeaders(index->ContentSize(), 200, "");
                                                this->Write(index->Contents());
                                        }
                                        else
@@ -214,7 +225,7 @@ class HttpSocket : public InspSocket
 
                                                if (!claimed)
                                                {
-                                                       SendHeaders(0, 404);
+                                                       SendHeaders(0, 404, "");
                                                        log(DEBUG,"Page not claimed, 404");
                                                }
                                        }
@@ -233,10 +244,10 @@ class HttpSocket : public InspSocket
                }
        }
 
-       void Page(std::stringstream* n, int response)
+       void Page(std::stringstream* n, int response, std::string& extraheaders)
        {
                log(DEBUG,"Sending page");
-               SendHeaders(n->str().length(),response);
+               SendHeaders(n->str().length(), response, extraheaders);
                this->Write(n->str());
        }
 };
@@ -267,7 +278,7 @@ class ModuleHttp : public Module
 
        void CreateListener()
        {
-               http = new HttpSocket(this->bindip, this->port, true, 0, &index);
+               http = new HttpSocket(ServerInstance, this->bindip, this->port, true, 0, &index);
                if ((http) && (http->GetState() == I_LISTENING))
                {
                        Srv->AddSocket(http);
@@ -291,7 +302,7 @@ class ModuleHttp : public Module
                claimed = true;
                HTTPDocument* doc = (HTTPDocument*)request->GetData();
                HttpSocket* sock = (HttpSocket*)doc->sock;
-               sock->Page(doc->GetDocument(), doc->GetResponseCode());
+               sock->Page(doc->GetDocument(), doc->GetResponseCode(), doc->GetExtraHeaders());
                return NULL;
        }
 
@@ -307,7 +318,7 @@ class ModuleHttp : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1,0,0,0,VF_STATIC|VF_VENDOR|VF_SERVICEPROVIDER);
        }
 };