HTTP_SERVE_SEND_DATA = 3 /* Sending response */
};
-class HttpServerSocket;
-
-/** This class is used to handle HTTP socket timeouts
- */
-class HttpServerTimeout : public Timer
-{
- private:
- /** HttpServerSocket we are attached to
- */
- HttpServerSocket* s;
- /** Socketengine the file descriptor is in
- */
- SocketEngine* SE;
- public:
- /** Attach timeout to HttpServerSocket
- */
- HttpServerTimeout(HttpServerSocket* sock, SocketEngine* engine);
- /** Handle timer tick
- */
- void Tick(time_t TIME);
-};
-
/** A socket used for HTTP transport
*/
class HttpServerSocket : public BufferedSocket
std::string request_type;
std::string uri;
std::string http_version;
- bool keepalive;
-
- HttpServerTimeout* Timeout;
- bool DataSinceLastTick;
- friend class HttpServerTimeout;
public:
HttpServerSocket(InspIRCd* SI, std::string shost, int iport, bool listening, unsigned long maxtime, FileReader* index_page) : BufferedSocket(SI, shost, iport, listening, maxtime), index(index_page), postsize(0)
{
InternalState = HTTP_LISTEN;
- Timeout = NULL;
}
- HttpServerSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : BufferedSocket(SI, newfd, ip), index(ind), postsize(0), keepalive(false), DataSinceLastTick(false)
+ HttpServerSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : BufferedSocket(SI, newfd, ip), index(ind), postsize(0)
{
InternalState = HTTP_SERVE_WAIT_REQUEST;
- Timeout = new HttpServerTimeout(this, Instance->SE);
- Instance->Timers->AddTimer(Timeout);
}
FileReader* GetIndex()
~HttpServerSocket()
{
- if (Timeout)
- {
- if (Instance->Time() < Timeout->GetTimer())
- Instance->Timers->DelTimer(Timeout);
- Timeout = NULL;
- }
- }
-
- void ResetRequest()
- {
- headers.Clear();
- postdata.clear();
- postsize = 0;
- request_type.clear();
- uri.clear();
- http_version.clear();
- InternalState = HTTP_SERVE_WAIT_REQUEST;
-
- if (reqbuffer.size())
- CheckRequestBuffer();
}
virtual int OnIncomingConnection(int newsock, char* ip)
SendHeaders(data.length(), response, empty);
this->Write(data);
-
- if (keepalive)
- ResetRequest();
+ this->FlushWriteBuffer();
}
void SendHeaders(unsigned long size, int response, HTTPHeaders &rheaders)
date[strlen(date) - 1] = '\0';
rheaders.CreateHeader("Date", date);
- rheaders.CreateHeader("Server", "InspIRCd/m_httpd.so/1.1");
+ rheaders.CreateHeader("Server", "InspIRCd/m_httpd.so/1.2");
rheaders.SetHeader("Content-Length", ConvToStr(size));
if (size)
else
rheaders.RemoveHeader("Content-Type");
- if (rheaders.GetHeader("Connection") == "Close")
- keepalive = false;
- else if (rheaders.GetHeader("Connection") == "Keep-Alive" && !headers.IsSet("Connection"))
- keepalive = true;
- else if (!rheaders.IsSet("Connection") && !keepalive)
- rheaders.SetHeader("Connection", "Close");
+ /* Supporting Connection: keep-alive causes a whole world of hurt syncronizing timeouts,
+ * so remove it, its not essential for what we need.
+ */
+ rheaders.SetHeader("Connection", "Close");
this->Write(rheaders.GetFormattedHeaders());
this->Write("\r\n");
-
- if (!size && keepalive)
- ResetRequest();
}
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)
return false;
- DataSinceLastTick = true;
-
if (InternalState == HTTP_SERVE_RECV_POSTDATA)
{
postdata.append(data);
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;
}
if (request_type.empty() || uri.empty() || http_version.empty())
{
SendHTTPError(400);
+ SetWrite();
return;
}
if ((fieldsep == std::string::npos) || (fieldsep == 0) || (fieldsep == cheader.length() - 1))
{
SendHTTPError(400);
+ SetWrite();
return;
}
if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0"))
{
SendHTTPError(505);
+ SetWrite();
return;
}
-
- if (strcasecmp(headers.GetHeader("Connection").c_str(), "keep-alive") == 0)
- keepalive = true;
-
+
if (headers.IsSet("Content-Length") && (postsize = atoi(headers.GetHeader("Content-Length").c_str())) != 0)
{
InternalState = HTTP_SERVE_RECV_POSTDATA;
HTTPHeaders empty;
SendHeaders(index->ContentSize(), 200, empty);
this->Write(index->Contents());
+ this->FlushWriteBuffer();
+ SetWrite();
}
else
{
claimed = false;
HTTPRequest httpr(request_type,uri,&headers,this,this->GetIP(),postdata);
- Event e((char*)&httpr, (Module*)HttpModule, "httpd_url");
- e.Send(this->Instance);
+ Event acl((char*)&httpr, (Module*)HttpModule, "httpd_acl");
+ acl.Send(this->Instance);
if (!claimed)
{
- SendHTTPError(404);
+ Event e((char*)&httpr, (Module*)HttpModule, "httpd_url");
+ e.Send(this->Instance);
+ if (!claimed)
+ {
+ SendHTTPError(404);
+ SetWrite();
+ }
}
}
}
+
+ bool OnWriteReady()
+ {
+ Instance->Logs->Log("m_httpd",DEBUG,"OnWriteReady()");
+ return false;
+ }
+
void Page(std::stringstream* n, int response, HTTPHeaders *hheaders)
{
SendHeaders(n->str().length(), response, *hheaders);
this->Write(n->str());
-
- if (!keepalive)
- {
- Instance->SE->DelFd(this);
- this->Close();
- }
- else
- this->ResetRequest();
+ this->FlushWriteBuffer();
+ SetWrite();
}
-};
-HttpServerTimeout::HttpServerTimeout(HttpServerSocket* sock, SocketEngine* engine) : Timer(15, time(NULL), true), s(sock), SE(engine)
-{
-}
-
-void HttpServerTimeout::Tick(time_t TIME)
-{
- if (!s->DataSinceLastTick)
+ void SetWrite()
{
- SE->DelFd(s);
- s->Close();
- s->Timeout = NULL;
- this->CancelRepeat();
+ Instance->Logs->Log("m_httpd",DEBUG,"SetWrite()");
+ this->WaitingForWriteEvent = true;
+ Instance->SE->WantWrite(this);
}
- else
- s->DataSinceLastTick = false;
-}
+};
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();
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);
}
};
projects / user / henk / code / inspircd.git / blobdiff