summaryrefslogtreecommitdiffstats
path: root/src/HTTPServer
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-04-19 17:32:44 +0200
committerMattes D <github@xoft.cz>2015-04-19 17:32:44 +0200
commitd40078d163036fbc2207bf2f5a9fbf7eeaa44fc1 (patch)
tree5c6962d3859ac3dcf67a288d59dfc05ed5859323 /src/HTTPServer
parentMerge pull request #1864 from mc-server/StrictRecipeMatching (diff)
downloadcuberite-d40078d163036fbc2207bf2f5a9fbf7eeaa44fc1.tar
cuberite-d40078d163036fbc2207bf2f5a9fbf7eeaa44fc1.tar.gz
cuberite-d40078d163036fbc2207bf2f5a9fbf7eeaa44fc1.tar.bz2
cuberite-d40078d163036fbc2207bf2f5a9fbf7eeaa44fc1.tar.lz
cuberite-d40078d163036fbc2207bf2f5a9fbf7eeaa44fc1.tar.xz
cuberite-d40078d163036fbc2207bf2f5a9fbf7eeaa44fc1.tar.zst
cuberite-d40078d163036fbc2207bf2f5a9fbf7eeaa44fc1.zip
Diffstat (limited to 'src/HTTPServer')
-rw-r--r--src/HTTPServer/HTTPConnection.cpp4
-rw-r--r--src/HTTPServer/HTTPConnection.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/HTTPServer/HTTPConnection.cpp b/src/HTTPServer/HTTPConnection.cpp
index de12b36ce..a5c6afd18 100644
--- a/src/HTTPServer/HTTPConnection.cpp
+++ b/src/HTTPServer/HTTPConnection.cpp
@@ -38,7 +38,9 @@ cHTTPConnection::~cHTTPConnection()
void cHTTPConnection::SendStatusAndReason(int a_StatusCode, const AString & a_Response)
{
- SendData(Printf("%d %s\r\nContent-Length: 0\r\n\r\n", a_StatusCode, a_Response.c_str()));
+ SendData(Printf("HTTP/1.1 %d %s\r\n", a_StatusCode, a_Response.c_str()));
+ SendData(Printf("Content-Length: %u\r\n\r\n", static_cast<unsigned>(a_Response.size())));
+ SendData(a_Response.data(), a_Response.size());
m_State = wcsRecvHeaders;
}
diff --git a/src/HTTPServer/HTTPConnection.h b/src/HTTPServer/HTTPConnection.h
index 8ecc4a4d4..e1ebeb9ee 100644
--- a/src/HTTPServer/HTTPConnection.h
+++ b/src/HTTPServer/HTTPConnection.h
@@ -41,7 +41,8 @@ public:
cHTTPConnection(cHTTPServer & a_HTTPServer);
virtual ~cHTTPConnection();
- /** Sends HTTP status code together with a_Reason (used for HTTP errors) */
+ /** Sends HTTP status code together with a_Reason (used for HTTP errors).
+ Sends the a_Reason as the body as well, so that browsers display it. */
void SendStatusAndReason(int a_StatusCode, const AString & a_Reason);
/** Sends the "401 unauthorized" reply together with instructions on authorizing, using the specified realm */