Provide more information about exceptions in Http::Server

[libs/net.git] / source / http / server.cpp

diff --git a/source/http/server.cpp b/source/http/server.cpp
index 9bdfa61ac153cb188ea4688ad5a911df4114f539..7caa0f5d025b6eb0e55db15f55cbf896aadf40ba 100644 (file)
--- a/source/http/server.cpp
+++ b/source/http/server.cpp
@@ -1,10 +1,13 @@
 #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"
@@ -62,10 +65,12 @@ void Server::submit_response(Response &resp)
 {
        Client &cl = get_client_by_response(resp);
        if(cl.async)
-       {
-               cl.sock->write(resp.str());
-               cl.stale = true;
-       }
+               send_response(cl, *cl.response);
+}
+
+void Server::cancel_keepalive(Response &resp)
+{
+       get_client_by_response(resp).keepalive = false;
 }
 
 void Server::data_available()
@@ -103,7 +108,7 @@ void Server::client_data_available(Client &cl)
                                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")
@@ -120,7 +125,8 @@ void Server::client_data_available(Client &cl)
                        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();
                }
@@ -131,11 +137,11 @@ void Server::client_data_available(Client &cl)
                cl.in_buf.erase(0, len);
        }
 
-       bool keepalive = false;
        if(cl.request && cl.request->is_complete() && !response)
        {
+               cl.keepalive = false;
                if(cl.request->has_header("Connection"))
-                       keepalive = (cl.request->get_header("Connection")=="keep-alive");
+                       cl.keepalive = !strcasecmp(cl.request->get_header("Connection"), "keep-alive");
 
                response = new Response(NONE);
                try
@@ -161,25 +167,32 @@ void Server::client_data_available(Client &cl)
                        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(response)
+               send_response(cl, *response);
+}
+
+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)
        {
-               cl.sock->write(response->str());
-               if(keepalive)
-               {
-                       delete cl.request;
-                       cl.request = 0;
-                       delete cl.response;
-                       cl.response = 0;
-               }
-               else
-               {
-                       cl.sock->shutdown(IO::M_WRITE);
-                       cl.stale = true;
-               }
+               delete cl.request;
+               cl.request = 0;
+               delete cl.response;
+               cl.response = 0;
+       }
+       else
+       {
+               cl.sock->shutdown(IO::M_WRITE);
+               cl.stale = true;
        }
 }
 
@@ -198,6 +211,7 @@ Server::Client::Client(RefPtr<Net::StreamSocket> s):
        sock(s),
        request(0),
        response(0),
+       keepalive(false),
        async(false),
        stale(false)
 { }