X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhttp%2Fserver.cpp;h=f985bf994526bf871844b97cfd263f2ee56ee2ef;hb=d20870655aeca0614d9fc315fe5f9893ebdc7aa3;hp=7caa0f5d025b6eb0e55db15f55cbf896aadf40ba;hpb=6af74d460a0ec4f53bb5cff328ee34d05131be9a;p=libs%2Fnet.git

diff --git a/source/http/server.cpp b/source/http/server.cpp
index 7caa0f5..f985bf9 100644
--- a/source/http/server.cpp
+++ b/source/http/server.cpp
@@ -92,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> response;
 	if(!cl.request)
@@ -133,7 +141,7 @@ void Server::client_data_available(Client &cl)
 	}
 	else
 	{
-		len = cl.request->parse_content(cl.in_buf);
+		unsigned len = cl.request->parse_content(cl.in_buf);
 		cl.in_buf.erase(0, len);
 	}
 
@@ -180,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)
 	{