X-Git-Url: http://git.tdb.fi/?p=libs%2Fnet.git;a=blobdiff_plain;f=source%2Fhttp%2Fserver.cpp;h=f0474fd18e993c57de16b1a3f51c07dc260f069f;hp=e0b34b382e8a9d86e0a9c0a862a2a9250fa2220a;hb=b4e0f7ed23f24e78fd09c9b7f206279e16d38c1e;hpb=0165ed331051ae7fc64dfe85dd7ab8f5b11ba919

diff --git a/source/http/server.cpp b/source/http/server.cpp
index e0b34b3..f0474fd 100644
--- a/source/http/server.cpp
+++ b/source/http/server.cpp
@@ -5,6 +5,7 @@
 #include <msp/net/resolve.h>
 #include <msp/net/streamsocket.h>
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include "request.h"
 #include "response.h"
 #include "server.h"
@@ -23,6 +24,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();
@@ -57,10 +63,12 @@ void Server::submit_response(Response &resp)
 {
 	Client &cl = get_client_by_response(resp);
 	if(cl.async)
-	{
-		cl.sock->write(resp.str());
-		cl.stale = true;
-	}
+		send_response(cl, *cl.response);
+}
+
+void Server::cancel_keepalive(Response &resp)
+{
+	get_client_by_response(resp).keepalive = false;
 }
 
 void Server::data_available()
@@ -98,7 +106,7 @@ void Server::client_data_available(Client &cl)
 				cl.request = new Request(Request::parse(cl.in_buf));
 
 				string addr_str = cl.sock->get_peer_address().str();
-				unsigned colon = addr_str.find(':');
+				string::size_type colon = addr_str.find(':');
 				cl.request->set_header("-Client-Host", addr_str.substr(0, colon));
 
 				if(cl.request->get_method()!="GET" && cl.request->get_method()!="POST")
@@ -106,6 +114,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,11 +134,11 @@ void Server::client_data_available(Client &cl)
 		cl.in_buf.erase(0, len);
 	}
 
-	bool keepalive = false;
 	if(cl.request && cl.request->is_complete() && !response)
 	{
+		cl.keepalive = false;
 		if(cl.request->has_header("Connection"))
-			keepalive = (cl.request->get_header("Connection")=="keep-alive");
+			cl.keepalive = !strcasecmp(cl.request->get_header("Connection"), "keep-alive");
 
 		response = new Response(NONE);
 		try
@@ -156,20 +169,26 @@ void Server::client_data_available(Client &cl)
 	}
 
 	if(response)
+		send_response(cl, *response);
+}
+
+void Server::send_response(Client &cl, Response &resp)
+{
+	if(cl.keepalive)
+		resp.set_header("Connection", "keep-alive");
+	cl.sock->write(resp.str());
+	cl.async = false;
+	if(cl.keepalive)
 	{
-		cl.sock->write(response->str());
-		if(keepalive)
-		{
-			delete cl.request;
-			cl.request = 0;
-			delete cl.response;
-			cl.response = 0;
-		}
-		else
-		{
-			cl.sock->shutdown(IO::M_WRITE);
-			cl.stale = true;
-		}
+		delete cl.request;
+		cl.request = 0;
+		delete cl.response;
+		cl.response = 0;
+	}
+	else
+	{
+		cl.sock->shutdown(IO::M_WRITE);
+		cl.stale = true;
 	}
 }
 
@@ -188,6 +207,7 @@ Server::Client::Client(RefPtr<Net::StreamSocket> s):
 	sock(s),
 	request(0),
 	response(0),
+	keepalive(false),
 	async(false),
 	stale(false)
 { }