Browse Source

* HTTPServer.cpp : update response building

pull/503/head
hagen 9 years ago
parent
commit
f10064ce39
  1. 21
      HTTPServer.cpp

21
HTTPServer.cpp

@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
#include <ctime>
#include <iomanip>
#include <sstream>
#include <thread>
@ -749,7 +748,7 @@ namespace http { @@ -749,7 +748,7 @@ namespace http {
if (needAuth && !CheckAuth(req)) {
res.code = 401;
res.headers.insert(std::pair<std::string, std::string>("WWW-Authenticate", "Basic realm=\"WebAdmin\""));
res.add_header("WWW-Authenticate", "Basic realm=\"WebAdmin\"");
SendReply(res, content);
return;
}
@ -763,6 +762,8 @@ namespace http { @@ -763,6 +762,8 @@ namespace http {
else
ShowStatus (s);
ShowPageTail (s);
res.code = 200;
content = s.str ();
SendReply (res, content);
}
@ -845,21 +846,11 @@ namespace http { @@ -845,21 +846,11 @@ namespace http {
void HTTPConnection::SendReply (HTTPRes& reply, std::string& content)
{
std::time_t time_now = std::time(nullptr);
char time_buff[128];
std::strftime(time_buff, sizeof(time_buff), "%a, %d %b %Y %H:%M:%S GMT", std::gmtime(&time_now));
reply.status = HTTPCodeToStatus(reply.code);
reply.headers.insert(std::pair<std::string, std::string>("Date", time_buff));
reply.headers.insert(std::pair<std::string, std::string>("Content-Type", "text/html"));
reply.headers.insert(std::pair<std::string, std::string>("Content-Length", std::to_string(content.size())));
reply.add_header("Content-Type", "text/html");
reply.body = content;
std::string res = reply.to_string();
std::vector<boost::asio::const_buffer> buffers;
buffers.push_back(boost::asio::buffer(res));
buffers.push_back(boost::asio::buffer(content));
boost::asio::async_write (*m_Socket, buffers,
boost::asio::async_write (*m_Socket, boost::asio::buffer(res),
std::bind (&HTTPConnection::Terminate, shared_from_this (), std::placeholders::_1));
}

Loading…
Cancel
Save