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

diff --git a/source/http/server.cpp b/source/http/server.cpp
index b18ed4c..9bdfa61 100644
--- a/source/http/server.cpp
+++ b/source/http/server.cpp
@@ -23,6 +23,11 @@ Server::Server(unsigned port):
 	sock.listen(*addr, 8);
 }
 
+// Avoid emitting sigc::signal destructor in files including server.h
+Server::~Server()
+{
+}
+
 unsigned Server::get_port() const
 {
 	const Net::SockAddr &addr = sock.get_local_address();
@@ -106,6 +111,11 @@ void Server::client_data_available(Client &cl)
 					response = new Response(NOT_IMPLEMENTED);
 					response->add_content("Method not implemented\n");
 				}
+				else if(cl.request->get_path()[0]!='/')
+				{
+					response = new Response(BAD_REQUEST);
+					response->add_content("Path must be absolute\n");
+				}
 			}
 			catch(const exception &e)
 			{
@@ -121,8 +131,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
 		{
@@ -154,7 +168,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;
+		}
 	}
 }