Don't generate a duplicate signal when the connection is closed

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

diff --git a/source/http/server.cpp b/source/http/server.cpp
index 9205cc1096383caa797f1af237ec9e02e1b07724..b18ed4c76b02dec85572e41cfecac26f2f186852 100644 (file)
--- 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);
 }