X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhttp%2Fserver.cpp;h=f985bf994526bf871844b97cfd263f2ee56ee2ef;hb=d20870655aeca0614d9fc315fe5f9893ebdc7aa3;hp=f0474fd18e993c57de16b1a3f51c07dc260f069f;hpb=b4e0f7ed23f24e78fd09c9b7f206279e16d38c1e;p=libs%2Fnet.git diff --git a/source/http/server.cpp b/source/http/server.cpp index f0474fd..f985bf9 100644 --- a/source/http/server.cpp +++ b/source/http/server.cpp @@ -1,6 +1,8 @@ #include +#include #include #include +#include #include #include #include @@ -90,11 +92,19 @@ void Server::client_data_available(Client &cl) 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; if(!cl.request) @@ -123,14 +133,15 @@ 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(); } } else { - len = cl.request->parse_content(cl.in_buf); + unsigned len = cl.request->parse_content(cl.in_buf); cl.in_buf.erase(0, len); } @@ -164,7 +175,8 @@ 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())); } } @@ -176,7 +188,17 @@ void Server::send_response(Client &cl, Response &resp) { 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) {