X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhttp%2Fserver.h;h=8665fa3c88f5c0777f25e11ce578f23d2a8d67ff;hb=d6ba60220dadabe552f9f7dc2b4fc34b51cf4d32;hp=04c2d06b5cf6d386fa7d3f357036f3efaabba4df;hpb=f839e84e68924129a9fa5941ad82e4e9cc1def4d;p=libs%2Fnet.git

diff --git a/source/http/server.h b/source/http/server.h
index 04c2d06..8665fa3 100644
--- a/source/http/server.h
+++ b/source/http/server.h
@@ -1,9 +1,10 @@
 #ifndef MSP_HTTP_SERVER_H_
 #define MSP_HTTP_SERVER_H_
 
-#include <msp/core/refptr.h>
 #include <msp/io/eventdispatcher.h>
+#include <msp/net/mspnet_api.h>
 #include <msp/net/streamserversocket.h>
+#include <msp/time/timedelta.h>
 
 namespace Msp {
 namespace Http {
@@ -11,7 +12,7 @@ namespace Http {
 class Request;
 class Response;
 
-class Server
+class MSPNET_API Server
 {
 public:
 	sigc::signal<void, const Request &, Response &> signal_request;
@@ -19,33 +20,38 @@ public:
 private:
 	struct Client
 	{
-		RefPtr<Net::StreamSocket> sock;
+		std::unique_ptr<Net::StreamSocket> sock;
 		std::string in_buf;
-		Request *request;
-		Response *response;
-		bool async;
-		bool stale;
+		std::unique_ptr<Request> request;
+		std::unique_ptr<Response> response;
+		bool keepalive = false;
+		bool async = false;
+		bool stale = false;
 
-		Client(RefPtr<Net::StreamSocket>);
-		~Client();
+		Client(std::unique_ptr<Net::StreamSocket>);
 	};
 
 	Net::StreamServerSocket sock;
 	std::list<Client> clients;
 	std::map<Response *, Client *> responses;
-	IO::EventDispatcher *event_disp;
+	IO::EventDispatcher *event_disp = nullptr;
 
 public:
+	Server();
 	Server(unsigned);
 	~Server();
 
+	void listen(unsigned);
 	unsigned get_port() const;
 	void use_event_dispatcher(IO::EventDispatcher *);
 	void delay_response(Response &);
 	void submit_response(Response &);
+	void cancel_keepalive(Response &);
+	void close_connections(const Time::TimeDelta &);
 private:
 	void data_available();
 	void client_data_available(Client &);
+	void send_response(Client &, Response &);
 	void client_end_of_file(Client &);
 	Client &get_client_by_response(Response &);
 };