Implement connection keep-alive in HttpServer

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

diff --git a/source/http/server.cpp b/source/http/server.cpp
index 47de7dd381b6c84cd995e4dd56239ab64d91b2e2..e0b34b382e8a9d86e0a9c0a862a2a9250fa2220a 100644 (file)
--- a/source/http/server.cpp
+++ b/source/http/server.cpp
@@ -84,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;
@@ -119,8 +121,12 @@ void Server::client_data_available(Client &cl)
                cl.in_buf.erase(0, len);
        }
 
+       bool keepalive = false;
        if(cl.request && cl.request->is_complete() && !response)
        {
+               if(cl.request->has_header("Connection"))
+                       keepalive = (cl.request->get_header("Connection")=="keep-alive");
+
                response = new Response(NONE);
                try
                {
@@ -152,7 +158,18 @@ void Server::client_data_available(Client &cl)
        if(response)
        {
                cl.sock->write(response->str());
-               cl.stale = true;
+               if(keepalive)
+               {
+                       delete cl.request;
+                       cl.request = 0;
+                       delete cl.response;
+                       cl.response = 0;
+               }
+               else
+               {
+                       cl.sock->shutdown(IO::M_WRITE);
+                       cl.stale = true;
+               }
        }
 }