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

Renamed HTTPResponse to HTTPOutgoingResponse.

This commit is contained in:
Mattes D 2016-02-20 12:33:27 +01:00
parent 52d18b4559
commit 71a1fa81f0
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/HTTP/HTTPMessage.cpp
View File

@ -69,7 +69,7 @@ void cHTTPMessage::AddHeader(const AString & a_Key, const AString & a_Value)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cHTTPResponse: // cHTTPResponse:
cHTTPResponse::cHTTPResponse(void) : cHTTPOutgoingResponse::cHTTPOutgoingResponse(void) :
super(mkResponse) super(mkResponse)
{ {
} }
@ -78,7 +78,7 @@ cHTTPResponse::cHTTPResponse(void) :
void cHTTPResponse::AppendToData(AString & a_DataStream) const void cHTTPOutgoingResponse::AppendToData(AString & a_DataStream) const
{ {
a_DataStream.append("HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nContent-Type: "); a_DataStream.append("HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nContent-Type: ");
a_DataStream.append(m_ContentType); a_DataStream.append(m_ContentType);

8
src/HTTP/HTTPMessage.h
View File

@ -65,17 +65,17 @@ protected:
class cHTTPResponse : /** Stores outgoing response headers and serializes them to an HTTP data stream. */
class cHTTPOutgoingResponse :
public cHTTPMessage public cHTTPMessage
{ {
typedef cHTTPMessage super; typedef cHTTPMessage super;
public: public:
cHTTPResponse(void); cHTTPOutgoingResponse(void);
/** Appends the response to the specified datastream - response line and headers. /** Appends the response to the specified datastream - response line and headers.
The body will be sent later directly through cConnection::Send() The body will be sent later directly through cConnection::Send() */
*/
void AppendToData(AString & a_DataStream) const; void AppendToData(AString & a_DataStream) const;
} ; } ;

1
src/HTTP/HTTPServer.h
View File

@ -23,7 +23,6 @@
class cHTTPMessage; class cHTTPMessage;
class cHTTPRequestParser; class cHTTPRequestParser;
class cHTTPIncomingRequest; class cHTTPIncomingRequest;
class cHTTPResponse;
class cHTTPServerConnection; class cHTTPServerConnection;

2
src/HTTP/HTTPServerConnection.cpp
View File

@ -59,7 +59,7 @@ void cHTTPServerConnection::SendNeedAuth(const AString & a_Realm)
void cHTTPServerConnection::Send(const cHTTPResponse & a_Response) void cHTTPServerConnection::Send(const cHTTPOutgoingResponse & a_Response)
{ {
ASSERT(m_CurrentRequest != nullptr); ASSERT(m_CurrentRequest != nullptr);
AString toSend; AString toSend;

4
src/HTTP/HTTPServerConnection.h
View File

@ -18,7 +18,7 @@
// fwd: // fwd:
class cHTTPServer; class cHTTPServer;
class cHTTPResponse; class cHTTPOutgoingResponse;
class cHTTPIncomingRequest; class cHTTPIncomingRequest;
@ -45,7 +45,7 @@ public:
void SendNeedAuth(const AString & a_Realm); void SendNeedAuth(const AString & a_Realm);
/** Sends the headers contained in a_Response */ /** Sends the headers contained in a_Response */
void Send(const cHTTPResponse & a_Response); void Send(const cHTTPOutgoingResponse & a_Response);
/** Sends the data as the response (may be called multiple times) */ /** Sends the data as the response (may be called multiple times) */
void Send(const void * a_Data, size_t a_Size); void Send(const void * a_Data, size_t a_Size);

8
src/WebAdmin.cpp
View File

@ -314,7 +314,7 @@ void cWebAdmin::HandleWebadminRequest(cHTTPServerConnection & a_Connection, cHTT
{ {
if (m_TemplateScript.Call("ShowPage", this, &TemplateRequest, cLuaState::Return, Template)) if (m_TemplateScript.Call("ShowPage", this, &TemplateRequest, cLuaState::Return, Template))
{ {
cHTTPResponse Resp; cHTTPOutgoingResponse Resp;
Resp.SetContentType("text/html"); Resp.SetContentType("text/html");
a_Connection.Send(Resp); a_Connection.Send(Resp);
a_Connection.Send(Template.c_str(), Template.length()); a_Connection.Send(Template.c_str(), Template.length());
@ -373,7 +373,7 @@ void cWebAdmin::HandleWebadminRequest(cHTTPServerConnection & a_Connection, cHTT
Printf(NumChunks, "%d", cRoot::Get()->GetTotalChunkCount()); Printf(NumChunks, "%d", cRoot::Get()->GetTotalChunkCount());
ReplaceString(Template, "{NUMCHUNKS}", NumChunks); ReplaceString(Template, "{NUMCHUNKS}", NumChunks);
cHTTPResponse Resp; cHTTPOutgoingResponse Resp;
Resp.SetContentType("text/html"); Resp.SetContentType("text/html");
a_Connection.Send(Resp); a_Connection.Send(Resp);
a_Connection.Send(Template.c_str(), Template.length()); a_Connection.Send(Template.c_str(), Template.length());
@ -388,7 +388,7 @@ void cWebAdmin::HandleRootRequest(cHTTPServerConnection & a_Connection, cHTTPInc
{ {
UNUSED(a_Request); UNUSED(a_Request);
cHTTPResponse Resp; cHTTPOutgoingResponse Resp;
Resp.SetContentType("text/html"); Resp.SetContentType("text/html");
a_Connection.Send(Resp); a_Connection.Send(Resp);
a_Connection.Send(m_LoginTemplate); a_Connection.Send(m_LoginTemplate);
@ -441,7 +441,7 @@ void cWebAdmin::HandleFileRequest(cHTTPServerConnection & a_Connection, cHTTPInc
} }
// Send the response: // Send the response:
cHTTPResponse Resp; cHTTPOutgoingResponse Resp;
Resp.SetContentType(ContentType); Resp.SetContentType(ContentType);
a_Connection.Send(Resp); a_Connection.Send(Resp);
a_Connection.Send(Content); a_Connection.Send(Content);