diff options
author | Mattes D <github@xoft.cz> | 2014-05-11 20:59:15 +0200 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-05-11 20:59:15 +0200 |
commit | e0c56b752204202840f60ed904210c99414517bb (patch) | |
tree | 4532e85cbcc873a2616147713e9f899ecf84d111 /src/HTTPServer/HTTPConnection.cpp | |
parent | Merge pull request #993 from mc-server/GridStructGen (diff) | |
parent | Merge branch 'master' into SslWebAdmin (diff) | |
download | cuberite-e0c56b752204202840f60ed904210c99414517bb.tar cuberite-e0c56b752204202840f60ed904210c99414517bb.tar.gz cuberite-e0c56b752204202840f60ed904210c99414517bb.tar.bz2 cuberite-e0c56b752204202840f60ed904210c99414517bb.tar.lz cuberite-e0c56b752204202840f60ed904210c99414517bb.tar.xz cuberite-e0c56b752204202840f60ed904210c99414517bb.tar.zst cuberite-e0c56b752204202840f60ed904210c99414517bb.zip |
Diffstat (limited to '')
-rw-r--r-- | src/HTTPServer/HTTPConnection.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/HTTPServer/HTTPConnection.cpp b/src/HTTPServer/HTTPConnection.cpp index da4df0e34..b127e7091 100644 --- a/src/HTTPServer/HTTPConnection.cpp +++ b/src/HTTPServer/HTTPConnection.cpp @@ -26,6 +26,7 @@ cHTTPConnection::cHTTPConnection(cHTTPServer & a_HTTPServer) : cHTTPConnection::~cHTTPConnection() { + // LOGD("HTTP: Connection deleting: %p", this); delete m_CurrentRequest; } @@ -144,7 +145,7 @@ void cHTTPConnection::Terminate(void) -void cHTTPConnection::DataReceived(const char * a_Data, size_t a_Size) +bool cHTTPConnection::DataReceived(const char * a_Data, size_t a_Size) { switch (m_State) { @@ -162,12 +163,12 @@ void cHTTPConnection::DataReceived(const char * a_Data, size_t a_Size) m_CurrentRequest = NULL; m_State = wcsInvalid; m_HTTPServer.CloseConnection(*this); - return; + return true; } if (m_CurrentRequest->IsInHeaders()) { // The request headers are not yet complete - return; + return false; } // The request has finished parsing its headers successfully, notify of it: @@ -183,13 +184,12 @@ void cHTTPConnection::DataReceived(const char * a_Data, size_t a_Size) // Process the rest of the incoming data into the request body: if (a_Size > BytesConsumed) { - DataReceived(a_Data + BytesConsumed, a_Size - BytesConsumed); + return cHTTPConnection::DataReceived(a_Data + BytesConsumed, a_Size - BytesConsumed); } else { - DataReceived("", 0); // If the request has zero body length, let it be processed right-away + return cHTTPConnection::DataReceived("", 0); // If the request has zero body length, let it be processed right-away } - break; } case wcsRecvBody: @@ -209,7 +209,7 @@ void cHTTPConnection::DataReceived(const char * a_Data, size_t a_Size) { m_State = wcsInvalid; m_HTTPServer.CloseConnection(*this); - return; + return true; } delete m_CurrentRequest; m_CurrentRequest = NULL; @@ -223,6 +223,7 @@ void cHTTPConnection::DataReceived(const char * a_Data, size_t a_Size) break; } } + return false; } |