flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Added cHTTPServer callbacks; fixed keep-alives.

Browse Source 
The HTTP server now calls callbacks specified in its start function (debugified atm.) and it processes multiple requests on a single connection.
This commit is contained in:
madmaxoft
2013-09-27 21:28:41 +02:00
parent 8c57c5c1f2
commit 5cf8fc12ae
4 changed files with 132 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/HTTPServer/HTTPConnection.cpp
View File

@@ -69,6 +69,39 @@ void cHTTPConnection::FinishResponse(void)
void cHTTPConnection::AwaitNextRequest(void)
{
switch (m_State)
{
case wcsRecvIdle:
{
// The client is waiting for a response, send an "Internal server error":
m_OutgoingData.append("HTTP/1.1 500 Internal Server Error\r\n\r\n");
m_HTTPServer.NotifyConnectionWrite(*this);
m_State = wcsRecvHeaders;
break;
}
case wcsSendingResp:
{
// The response headers have been sent, we need to terminate the response body:
m_OutgoingData.append("0\r\n\r\n");
m_State = wcsRecvHeaders;
break;
}
default:
{
ASSERT(!"Unhandled state recovery");
break;
}
}
}
void cHTTPConnection::DataReceived(const char * a_Data, int a_Size)
{
switch (m_State)
@@ -128,10 +161,10 @@ void cHTTPConnection::DataReceived(const char * a_Data, int a_Size)
}
if (m_CurrentRequestBodyRemaining == 0)
{
m_State = wcsRecvIdle;
m_HTTPServer.RequestFinished(*this, *m_CurrentRequest);
delete m_CurrentRequest;
m_CurrentRequest = NULL;
m_State = wcsRecvIdle;
}
break;
}