X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhttp%2Fserver.cpp;h=b18ed4c76b02dec85572e41cfecac26f2f186852;hb=2d106c4711c2277b9b3a7e53ad66c4bc22a6569f;hp=9205cc1096383caa797f1af237ec9e02e1b07724;hpb=debe1004676d5431e571d9c4361072661dcc88c4;p=libs%2Fnet.git

diff --git a/source/http/server.cpp b/source/http/server.cpp
index 9205cc1..b18ed4c 100644
--- a/source/http/server.cpp
+++ b/source/http/server.cpp
@@ -1,4 +1,5 @@
 #include <exception>
+#include <msp/core/maputils.h>
 #include <msp/core/refptr.h>
 #include <msp/net/inet.h>
 #include <msp/net/resolve.h>
@@ -83,6 +84,8 @@ void Server::client_data_available(Client &cl)
 
 	char rbuf[4096];
 	unsigned len = cl.sock->read(rbuf, sizeof(rbuf));
+	if(cl.stale)
+		return;
 	cl.in_buf.append(rbuf, len);
 
 	RefPtr<Response> response;
@@ -124,11 +127,13 @@ void Server::client_data_available(Client &cl)
 		try
 		{
 			cl.response = response.get();
+			responses[cl.response] = &cl;
 			signal_request.emit(*cl.request, *response);
 			if(cl.async)
 				response.release();
 			else
 			{
+				responses.erase(cl.response);
 				cl.response = 0;
 				if(response->get_status()==NONE)
 				{
@@ -139,6 +144,7 @@ void Server::client_data_available(Client &cl)
 		}
 		catch(const exception &e)
 		{
+			responses.erase(cl.response);
 			cl.response = 0;
 			response = new Response(INTERNAL_ERROR);
 			response->add_content(e.what());
@@ -159,12 +165,7 @@ void Server::client_end_of_file(Client &cl)
 
 Server::Client &Server::get_client_by_response(Response &resp)
 {
-	for(list<Client>::iterator i=clients.begin(); i!=clients.end(); ++i)
-		if(i->response==&resp)
-			return *i;
-
-	// XXX Do this differently
-	throw invalid_argument("Response does not belong to any client");
+	return *get_item(responses, &resp);
 }