#include <exception>
+#include <typeinfo>
#include <msp/core/maputils.h>
#include <msp/core/refptr.h>
+#include <msp/debug/demangle.h>
#include <msp/net/inet.h>
#include <msp/net/resolve.h>
#include <msp/net/streamsocket.h>
#include <msp/strings/format.h>
+#include <msp/strings/utils.h>
#include "request.h"
#include "response.h"
#include "server.h"
send_response(cl, *cl.response);
}
+void Server::cancel_keepalive(Response &resp)
+{
+ get_client_by_response(resp).keepalive = false;
+}
+
void Server::data_available()
{
Net::StreamSocket *csock = sock.accept();
cl.request = new Request(Request::parse(cl.in_buf));
string addr_str = cl.sock->get_peer_address().str();
- unsigned colon = addr_str.find(':');
+ string::size_type colon = addr_str.find(':');
cl.request->set_header("-Client-Host", addr_str.substr(0, colon));
if(cl.request->get_method()!="GET" && cl.request->get_method()!="POST")
catch(const exception &e)
{
response = new Response(BAD_REQUEST);
- response->add_content(e.what());
+ response->add_content(format("An error occurred while parsing request headers:\ntype: %s\nwhat: %s",
+ Debug::demangle(typeid(e).name()), e.what()));
}
cl.in_buf = string();
}
{
cl.keepalive = false;
if(cl.request->has_header("Connection"))
- cl.keepalive = (cl.request->get_header("Connection")=="keep-alive");
+ cl.keepalive = !strcasecmp(cl.request->get_header("Connection"), "keep-alive");
response = new Response(NONE);
try
responses.erase(cl.response);
cl.response = 0;
response = new Response(INTERNAL_ERROR);
- response->add_content(e.what());
+ response->add_content(format("An error occurred while processing the request:\ntype: %s\nwhat: %s",
+ Debug::demangle(typeid(e).name()), e.what()));
}
}
void Server::send_response(Client &cl, Response &resp)
{
+ if(cl.keepalive)
+ resp.set_header("Connection", "keep-alive");
cl.sock->write(resp.str());
cl.async = false;
if(cl.keepalive)