Proper Connection: close header support. Commented out checks for HTTP 1.1

RamseyK · RamseyK · commit 73c7b5d0e9b1 · 2014-01-05T21:05:06.000-05:00
diff --git a/src/Client.cpp b/src/Client.cpp
@@ -1,7 +1,7 @@
 /**
 	httpserver
 	Client.cpp
-	Copyright 2011-2012 Ramsey Kant
+	Copyright 2011-2014 Ramsey Kant
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 */
 
 #include "Client.h"
-#include "HTTPServer.h"
 
 Client::Client(SOCKET fd, sockaddr_in addr) {
     socketDesc = fd;
diff --git a/src/Client.h b/src/Client.h
@@ -1,7 +1,7 @@
 /**
 	httpserver
 	Client.h
-	Copyright 2011-2012 Ramsey Kant
+	Copyright 2011-2014 Ramsey Kant
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/src/HTTPRequest.cpp b/src/HTTPRequest.cpp
@@ -133,10 +133,10 @@ bool HTTPRequest::parse() {
 	}
 
 	// Validate the HTTP version. If there is a mismatch, discontinue parsing
-	if(strcmp(version.c_str(), HTTP_VERSION) != 0) {
+	/*if(strcmp(version.c_str(), HTTP_VERSION) != 0) {
 		parseErrorStr = "Supported HTTP version does not match";
 		return false;
-	}
+	}*/
 
 	// Parse and populate the headers map using the parseHeaders helper
 	parseHeaders();
diff --git a/src/HTTPResponse.cpp b/src/HTTPResponse.cpp
@@ -137,10 +137,10 @@ bool HTTPResponse::parse() {
 	reason = getLine(); // Pull till \r\n termination
 	
 	// Validate the HTTP version. If there is a mismatch, discontinue parsing
-	if(strcmp(version.c_str(), HTTP_VERSION) != 0) {
+	/*if(strcmp(version.c_str(), HTTP_VERSION) != 0) {
 		parseErrorStr = "Supported HTTP version does not match";
 		return false;
-	}
+	}*/
 	
 	// Parse and populate the headers map using the parseHeaders helper
 	parseHeaders();
diff --git a/src/HTTPServer.cpp b/src/HTTPServer.cpp
@@ -1,7 +1,7 @@
 /**
 	httpserver
 	HTTPServer.cpp
-	Copyright 2011-2012 Ramsey Kant
+	Copyright 2011-2014 Ramsey Kant
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
@@ -394,11 +394,11 @@ void HTTPServer::handleRequest(Client *cl, HTTPRequest* req) {
     }
 
 	std::cout << "[" << cl->getClientIP() << "] " << req->methodIntToStr(req->getMethod()) << " " << req->getRequestUri() << std::endl;
-	/*cout << "Headers:" << endl;
+	/*std::cout << "Headers:" << std::endl;
 	for(int i = 0; i < req->getNumHeaders(); i++) {
-		cout << req->getHeaderStr(i) << endl;
+		std::cout << req->getHeaderStr(i) << std::endl;
 	}
-	cout << endl;*/
+	std::cout << std::endl;*/
     
     // Retrieve the host specified in the request (Required for HTTP/1.1 compliance)
 	std::string host = req->getHeaderValue("Host");
@@ -453,9 +453,13 @@ void HTTPServer::handleGet(Client* cl, HTTPRequest* req, ResourceHost* resHost)
 		// Only send a message body if it's a GET request. Never send a body for HEAD
 		if(req->getMethod() == Method(GET))
 			resp->setData(r->getData(), r->getSize());
-			
-		// Check if the client prefers to close the connection
-		bool dc = req->getHeaderValue("Connection").compare("close") == 0;
+		
+		bool dc = false;
+
+		// If Connection: close is specified, the connection should be terminated after the request is serviced
+		std::string connection_val = req->getHeaderValue("Connection");
+		if(connection_val.compare("close") == 0)
+			dc = true;
 			
 		sendResponse(cl, resp, dc);
 		delete resp;
diff --git a/src/HTTPServer.h b/src/HTTPServer.h
@@ -1,7 +1,7 @@
 /**
 	httpserver
 	HTTPServer.h
-	Copyright 2011-2012 Ramsey Kant
+	Copyright 2011-2014 Ramsey Kant
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
@@ -65,7 +65,7 @@ class HTTPServer {
     void readClient(Client* cl, int data_len);
     void writeClient(Client* cl, int avail_bytes);
 	void sendStatusResponse(Client* cl, int status, std::string msg = "");
-	void sendResponse(Client* cl, HTTPResponse* resp, bool disconnect = false);
+	void sendResponse(Client* cl, HTTPResponse* resp, bool disconnect);
     
     // Request handlers
     void handleRequest(Client* cl, HTTPRequest* req);
diff --git a/src/Resource.cpp b/src/Resource.cpp
@@ -1,7 +1,7 @@
 /**
 	httpserver
 	Resource.cpp
-	Copyright 2011-2012 Ramsey Kant
+	Copyright 2011-2014 Ramsey Kant
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/src/Resource.h b/src/Resource.h
@@ -1,7 +1,7 @@
 /**
 	httpserver
 	Resource.h
-	Copyright 2011-2012 Ramsey Kant
+	Copyright 2011-2014 Ramsey Kant
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/src/ResourceHost.cpp b/src/ResourceHost.cpp
@@ -1,7 +1,7 @@
 /**
 	httpserver
 	ResourceHost.cpp
-	Copyright 2011-2012 Ramsey Kant
+	Copyright 2011-2014 Ramsey Kant
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/src/ResourceHost.h b/src/ResourceHost.h
@@ -1,7 +1,7 @@
 /**
 	httpserver
 	ResourceHost.h
-	Copyright 2011-2012 Ramsey Kant
+	Copyright 2011-2014 Ramsey Kant
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/src/SendQueueItem.h b/src/SendQueueItem.h
@@ -27,7 +27,7 @@ class SendQueueItem {
 	byte* sendData;
 	unsigned int sendSize;
 	unsigned int sendOffset;
-	bool disconnect;
+	bool disconnect; // Flag indicating if the client should be disconnected after this item is dequeued
 
 public:
 	SendQueueItem(byte* data, unsigned int size, bool dc) {
