From d52a51f7b6530d2a63682798472840d7261ebad4 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Fri, 18 Jul 2014 09:18:00 +0200
Subject: Removed duplicate IPvX labels.

---
 src/HTTPServer/HTTPServer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/HTTPServer')

diff --git a/src/HTTPServer/HTTPServer.cpp b/src/HTTPServer/HTTPServer.cpp
index b7edf7829..8eabe5cb2 100644
--- a/src/HTTPServer/HTTPServer.cpp
+++ b/src/HTTPServer/HTTPServer.cpp
@@ -122,8 +122,8 @@ class cDebugCallbacks :
 // cHTTPServer:
 
 cHTTPServer::cHTTPServer(void) :
-	m_ListenThreadIPv4(*this, cSocket::IPv4, "WebServer IPv4"),
-	m_ListenThreadIPv6(*this, cSocket::IPv6, "WebServer IPv6"),
+	m_ListenThreadIPv4(*this, cSocket::IPv4, "WebServer"),
+	m_ListenThreadIPv6(*this, cSocket::IPv6, "WebServer"),
 	m_Callbacks(NULL)
 {
 }
-- 
cgit v1.2.3


From 5d966be741eef68749412d706de05d963628abc9 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Fri, 18 Jul 2014 00:46:39 -0700
Subject: HTTPServer/CMakeLists.txt: Replaced glob with list of files

---
 src/HTTPServer/CMakeLists.txt | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'src/HTTPServer')

diff --git a/src/HTTPServer/CMakeLists.txt b/src/HTTPServer/CMakeLists.txt
index dc894368d..a15b2494f 100644
--- a/src/HTTPServer/CMakeLists.txt
+++ b/src/HTTPServer/CMakeLists.txt
@@ -4,9 +4,24 @@ project (MCServer)
 
 include_directories ("${PROJECT_SOURCE_DIR}/../")
 
-file(GLOB SOURCE
-    "*.cpp"
-    "*.h"
-)
+SET (SRCS
+	EnvelopeParser.cpp
+	HTTPConnection.cpp
+	HTTPFormParser.cpp
+	HTTPMessage.cpp
+	HTTPServer.cpp
+	MultipartParser.cpp
+	NameValueParser.cpp
+	SslHTTPConnection.cpp)
 
-add_library(HTTPServer ${SOURCE})
+SET (HDRS
+	EnvelopeParser.h
+	HTTPConnection.h
+	HTTPFormParser.h
+	HTTPMessage.h
+	HTTPServer.h
+	MultipartParser.h
+	NameValueParser.h
+	SslHTTPConnection.h)
+
+add_library(HTTPServer ${SRCS} ${HDRS})
-- 
cgit v1.2.3


From 725d1fd1e2995b1720673c280fea1125ac338b3c Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Fri, 18 Jul 2014 13:26:43 -0700
Subject: Subdirs: Only add_library if not using MSVC

---
 src/HTTPServer/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/HTTPServer')

diff --git a/src/HTTPServer/CMakeLists.txt b/src/HTTPServer/CMakeLists.txt
index a15b2494f..b0efc810d 100644
--- a/src/HTTPServer/CMakeLists.txt
+++ b/src/HTTPServer/CMakeLists.txt
@@ -24,4 +24,6 @@ SET (HDRS
 	NameValueParser.h
 	SslHTTPConnection.h)
 
-add_library(HTTPServer ${SRCS} ${HDRS})
+if(NOT MSVC)
+	add_library(HTTPServer ${SRCS} ${HDRS})
+endif()
-- 
cgit v1.2.3


From 93d29555e58df172bafba530afbc593c16ec66a3 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Mon, 21 Jul 2014 15:19:48 +0200
Subject: Style: Normalized to no spaces before closing parenthesis.

---
 src/HTTPServer/HTTPConnection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/HTTPServer')

diff --git a/src/HTTPServer/HTTPConnection.cpp b/src/HTTPServer/HTTPConnection.cpp
index 21ff14373..b9c762e7c 100644
--- a/src/HTTPServer/HTTPConnection.cpp
+++ b/src/HTTPServer/HTTPConnection.cpp
@@ -100,7 +100,7 @@ void cHTTPConnection::AwaitNextRequest(void)
 	{
 		case wcsRecvHeaders:
 		{
-			// Nothing has been received yet, or a special response was given (SendStatusAndReason() or SendNeedAuth() )
+			// Nothing has been received yet, or a special response was given (SendStatusAndReason() or SendNeedAuth())
 			break;
 		}
 		
-- 
cgit v1.2.3


From 4191be7ddba820af4ed0c505a8d62416c2b7a8b4 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Tue, 22 Jul 2014 15:36:13 -0700
Subject: Removed redundant semicolons and re-added warning

---
 src/HTTPServer/HTTPMessage.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/HTTPServer')

diff --git a/src/HTTPServer/HTTPMessage.h b/src/HTTPServer/HTTPMessage.h
index dab942136..e402c8ad6 100644
--- a/src/HTTPServer/HTTPMessage.h
+++ b/src/HTTPServer/HTTPMessage.h
@@ -33,7 +33,7 @@ public:
 	cHTTPMessage(eKind a_Kind);
 
 	// Force a virtual destructor in all descendants
-	virtual ~cHTTPMessage() {};
+	virtual ~cHTTPMessage() {}
 	
 	/** Adds a header into the internal map of headers. Recognizes special headers: Content-Type and Content-Length */
 	void AddHeader(const AString & a_Key, const AString & a_Value);
-- 
cgit v1.2.3