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

Fixed HTTP message parsing, prepared for SSL.

Browse Source
This commit is contained in:
madmaxoft 2014-05-01 11:34:15 +02:00
parent e1b6a16945
commit a04cb6d146
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/HTTPServer/HTTPConnection.cpp
View File

@ -26,6 +26,7 @@ cHTTPConnection::cHTTPConnection(cHTTPServer & a_HTTPServer) :
cHTTPConnection::~cHTTPConnection() cHTTPConnection::~cHTTPConnection()
{ {
// LOGD("HTTP: Connection deleting: %p", this);
delete m_CurrentRequest; delete m_CurrentRequest;
} }
@ -183,11 +184,11 @@ void cHTTPConnection::DataReceived(const char * a_Data, size_t a_Size)
// Process the rest of the incoming data into the request body: // Process the rest of the incoming data into the request body:
if (a_Size > BytesConsumed) if (a_Size > BytesConsumed)
{ {
DataReceived(a_Data + BytesConsumed, a_Size - BytesConsumed); cHTTPConnection::DataReceived(a_Data + BytesConsumed, a_Size - BytesConsumed);
} }
else else
{ {
DataReceived("", 0); // If the request has zero body length, let it be processed right-away cHTTPConnection::DataReceived("", 0); // If the request has zero body length, let it be processed right-away
} }
break; break;
} }

2
src/HTTPServer/HTTPMessage.cpp
View File

@ -201,7 +201,7 @@ size_t cHTTPRequest::ParseRequestLine(const char * a_Data, size_t a_Size)
return AString::npos; return AString::npos;
} }
// Check that there's HTTP/version at the end // Check that there's HTTP/version at the end
if (strncmp(a_Data + URLEnd + 1, "HTTP/1.", 7) != 0) if (strncmp(m_IncomingHeaderData.c_str() + URLEnd + 1, "HTTP/1.", 7) != 0)
{ {
m_IsValid = false; m_IsValid = false;
return AString::npos; return AString::npos;