summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-05-01 11:34:15 +0200
committermadmaxoft <github@xoft.cz>2014-05-01 11:34:15 +0200
commita04cb6d146dfb8f04b0a8943c1e185fc25bf2829 (patch)
tree6a489301b85e29b574714283c086f89260892f1f
parentAdded a (disabled) test of low-security ciphersuites. (diff)
downloadcuberite-a04cb6d146dfb8f04b0a8943c1e185fc25bf2829.tar
cuberite-a04cb6d146dfb8f04b0a8943c1e185fc25bf2829.tar.gz
cuberite-a04cb6d146dfb8f04b0a8943c1e185fc25bf2829.tar.bz2
cuberite-a04cb6d146dfb8f04b0a8943c1e185fc25bf2829.tar.lz
cuberite-a04cb6d146dfb8f04b0a8943c1e185fc25bf2829.tar.xz
cuberite-a04cb6d146dfb8f04b0a8943c1e185fc25bf2829.tar.zst
cuberite-a04cb6d146dfb8f04b0a8943c1e185fc25bf2829.zip
Diffstat (limited to '')
-rw-r--r--src/HTTPServer/HTTPConnection.cpp5
-rw-r--r--src/HTTPServer/HTTPMessage.cpp2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/HTTPServer/HTTPConnection.cpp b/src/HTTPServer/HTTPConnection.cpp
index da4df0e34..8e95eff2d 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;
}
@@ -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:
if (a_Size > BytesConsumed)
{
- DataReceived(a_Data + BytesConsumed, a_Size - BytesConsumed);
+ cHTTPConnection::DataReceived(a_Data + BytesConsumed, a_Size - BytesConsumed);
}
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;
}
diff --git a/src/HTTPServer/HTTPMessage.cpp b/src/HTTPServer/HTTPMessage.cpp
index 4a3611050..44feda469 100644
--- a/src/HTTPServer/HTTPMessage.cpp
+++ b/src/HTTPServer/HTTPMessage.cpp
@@ -201,7 +201,7 @@ size_t cHTTPRequest::ParseRequestLine(const char * a_Data, size_t a_Size)
return AString::npos;
}
// 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;
return AString::npos;