1 files changed, 1 insertions, 139 deletions

diff --git a/source/HTTPServer/HTTPServer.cpp b/source/HTTPServer/HTTPServer.cpp
index e68032bc2..980cad14f 100644
--- a/source/HTTPServer/HTTPServer.cpp
+++ b/source/HTTPServer/HTTPServer.cpp
@@ -6,6 +6,7 @@
 #include "Globals.h"
 #include "HTTPServer.h"
 #include "HTTPMessage.h"
+#include "HTTPConnection.h"
 
 
 
@@ -21,145 +22,6 @@
 
 
 
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// cHTTPConnection:
-
-cHTTPConnection::cHTTPConnection(cHTTPServer & a_HTTPServer) :
-	m_HTTPServer(a_HTTPServer),
-	m_State(wcsRecvHeaders),
-	m_CurrentRequest(NULL)
-{
-}
-
-
-
-
-void cHTTPConnection::SendStatusAndReason(int a_StatusCode, const AString & a_Response)
-{
-	AppendPrintf(m_OutgoingData, "%d %s\r\n\r\n", a_StatusCode, a_Response.c_str());
-}
-
-
-
-
-
-void cHTTPConnection::Send(const cHTTPResponse & a_Response)
-{
-	ASSERT(m_State = wcsRecvIdle);
-	a_Response.AppendToData(m_OutgoingData);
-	m_State = wcsSendingResp;
-}
-
-
-
-
-
-void cHTTPConnection::Send(const void * a_Data, int a_Size)
-{
-	ASSERT(m_State == wcsSendingResp);
-	AppendPrintf(m_OutgoingData, "%x\r\n", a_Size);
-	m_OutgoingData.append((const char *)a_Data, a_Size);
-}
-
-
-
-
-
-void cHTTPConnection::FinishResponse(void)
-{
-	ASSERT(m_State == wcsSendingResp);
-	m_OutgoingData.append("0\r\n");
-	m_State = wcsRecvHeaders;
-}
-
-
-
-
-
-void cHTTPConnection::DataReceived(const char * a_Data, int a_Size)
-{
-	switch (m_State)
-	{
-		case wcsRecvHeaders:
-		{
-			ASSERT(m_CurrentRequest == NULL);
-
-			// Start searching 3 chars from the end of the already received data, if available:
-			size_t SearchStart = m_IncomingHeaderData.size();
-			SearchStart = (SearchStart > 3) ? SearchStart - 3 : 0;
-			
-			m_IncomingHeaderData.append(a_Data, a_Size);
-			
-			// Parse the header, if it is complete:
-			size_t idxEnd = m_IncomingHeaderData.find("\r\n\r\n", SearchStart);
-			if (idxEnd == AString::npos)
-			{
-				return;
-			}
-			m_CurrentRequest = new cHTTPRequest;
-			if (!m_CurrentRequest->ParseHeaders(m_IncomingHeaderData.c_str(), idxEnd + 2))
-			{
-				delete m_CurrentRequest;
-				m_CurrentRequest = NULL;
-				m_State = wcsInvalid;
-				m_HTTPServer.CloseConnection(*this);
-				return;
-			}
-			m_State = wcsRecvBody;
-			m_HTTPServer.NewRequest(*this, *m_CurrentRequest);
-			
-			// Process the rest of the incoming data into the request body:
-			if (m_IncomingHeaderData.size() > idxEnd + 4)
-			{
-				m_IncomingHeaderData.erase(0, idxEnd + 4);
-				DataReceived(m_IncomingHeaderData.c_str(), m_IncomingHeaderData.size());
-			}
-			break;
-		}
-
-		case wcsRecvBody:
-		{
-			ASSERT(m_CurrentRequest != NULL);
-			// TODO: Receive the body, and the next request (If HTTP/1.1 keepalive)
-			break;
-		}
-
-		default:
-		{
-			// TODO: Should we be receiving data in this state?
-			break;
-		}
-	}
-}
-
-
-
-
-
-void cHTTPConnection::GetOutgoingData(AString & a_Data)
-{
-	std::swap(a_Data, m_OutgoingData);
-}
-
-
-
-
-
-void cHTTPConnection::SocketClosed(void)
-{
-	if (m_CurrentRequest != NULL)
-	{
-		m_HTTPServer.RequestFinished(*this, *m_CurrentRequest);
-	}
-}
-
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// cHTTPServer:
-
 cHTTPServer::cHTTPServer(void) :
 	m_ListenThreadIPv4(*this, cSocket::IPv4, "WebServer IPv4"),
 	m_ListenThreadIPv6(*this, cSocket::IPv6, "WebServer IPv6"),