#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>
namespace Http {
Server::Server(unsigned port):
- sock(Net::INET),
+ sock(Net::INET6),
event_disp(0)
{
sock.signal_data_available.connect(sigc::mem_fun(this, &Server::data_available));
- RefPtr<Net::SockAddr> addr = Net::resolve("*", format("%d", port));
+ RefPtr<Net::SockAddr> addr = Net::resolve("*", format("%d", port), Net::INET6);
sock.listen(*addr, 8);
}
break;
}
- char rbuf[4096];
- unsigned len = cl.sock->read(rbuf, sizeof(rbuf));
- if(cl.stale)
+ try
+ {
+ char rbuf[4096];
+ unsigned len = cl.sock->read(rbuf, sizeof(rbuf));
+ if(cl.stale)
+ return;
+ cl.in_buf.append(rbuf, len);
+ }
+ catch(const exception &)
+ {
+ cl.stale = true;
return;
- cl.in_buf.append(rbuf, len);
+ }
RefPtr<Response> response;
if(!cl.request)
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();
}
}
else
{
- len = cl.request->parse_content(cl.in_buf);
+ unsigned len = cl.request->parse_content(cl.in_buf);
cl.in_buf.erase(0, len);
}
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()));
}
}
{
if(cl.keepalive)
resp.set_header("Connection", "keep-alive");
- cl.sock->write(resp.str());
+
+ try
+ {
+ cl.sock->write(resp.str());
+ }
+ catch(const exception &)
+ {
+ cl.stale = true;
+ return;
+ }
+
cl.async = false;
if(cl.keepalive)
{