Fixed includes in HttpServletExec

2 files changed, 35 insertions, 29 deletions

diff --git a/NetEx/HttpServletExec.cpp b/NetEx/HttpServletExec.cpp
index b8d92f7..e7e1c2b 100644
--- a/NetEx/HttpServletExec.cpp
+++ b/NetEx/HttpServletExec.cpp
@@ -3,23 +3,29 @@
     Copyright (c) 2011-2012, Starshatter OpenSource Distribution Contributors
     Copyright (c) 1997-2006, Destroyer Studios LLC.
 
-     AUTHOR:       John DiCamillo
+    AUTHOR:       John DiCamillo
 
 
-     OVERVIEW
-     ========
-     Network Server Pump for HTTP Server
+    OVERVIEW
+    ========
+    Network Server Pump for HTTP Server
 */
 
 #include "HttpServletExec.h"
-#include "HttpServlet.h"
-#include "NetLayer.h"
 
-#include <stdlib.h>
 #include <stdio.h>
-#include <ctype.h>
+#include <windows.h>
+
+#include "HttpRequest.h"
+#include "HttpResponse.h"
+#include "HttpServer.h"
+#include "HttpServlet.h"
+#include "HttpSession.h"
+#include "List.h"
+#include "HttpParam.h"
+#include "Utils.h"
+#include "NetLayer.h"
 
-// +-------------------------------------------------------------------+
 
 class HttpTestServlet : public HttpServlet
 {
@@ -86,14 +92,14 @@ public:
     }
 };
 
-// +-------------------------------------------------------------------+
-// +-------------------------------------------------------------------+
-// +-------------------------------------------------------------------+
 
 DWORD WINAPI HttpServletExecSessionProc(LPVOID link);
 
-HttpServletExec::HttpServletExec(WORD port, int poolsize)
-    : HttpServer(port, poolsize), session_timeout(60), exec_shutdown(false)
+
+HttpServletExec::HttpServletExec(WORD port, int poolsize) :
+    HttpServer(port, poolsize),
+    session_timeout(60),
+    exec_shutdown(false)
 {
     http_server_name = "Generic HttpServletExec 1.0";
 
@@ -101,6 +107,7 @@ HttpServletExec::HttpServletExec(WORD port, int poolsize)
     hsession = CreateThread(0, 4096, HttpServletExecSessionProc, (LPVOID) this, 0, &thread_id);
 }
 
+
 HttpServletExec::~HttpServletExec()
 {
     if (!exec_shutdown)
@@ -113,7 +120,6 @@ HttpServletExec::~HttpServletExec()
     sessions.destroy();
 }
 
-// +--------------------------------------------------------------------+
 
 HttpServlet*
 HttpServletExec::GetServlet(HttpRequest& request)
@@ -121,7 +127,6 @@ HttpServletExec::GetServlet(HttpRequest& request)
     return new HttpTestServlet;
 }
 
-// +--------------------------------------------------------------------+
 
 HttpSession*
 HttpServletExec::GetSession(HttpRequest& request)
@@ -159,7 +164,6 @@ HttpServletExec::GetSession(HttpRequest& request)
     return session;
 }
 
-// +--------------------------------------------------------------------+
 
 bool
 HttpServletExec::DoGet(HttpRequest& request, HttpResponse& response)
@@ -184,7 +188,6 @@ HttpServletExec::DoGet(HttpRequest& request, HttpResponse& response)
     return result;
 }
 
-// +--------------------------------------------------------------------+
 
 DWORD WINAPI HttpServletExecSessionProc(LPVOID link)
 {
@@ -196,6 +199,7 @@ DWORD WINAPI HttpServletExecSessionProc(LPVOID link)
     return (DWORD) E_POINTER;
 }
 
+
 DWORD
 HttpServletExec::CheckSessions()
 {
@@ -223,6 +227,7 @@ HttpServletExec::CheckSessions()
     return 0;
 }
 
+
 void
 HttpServletExec::DoSyncedCheck()
 {
diff --git a/NetEx/HttpServletExec.h b/NetEx/HttpServletExec.h
index ed89d1b..8c9fd2b 100644
--- a/NetEx/HttpServletExec.h
+++ b/NetEx/HttpServletExec.h
@@ -3,26 +3,26 @@
     Copyright (c) 2011-2012, Starshatter OpenSource Distribution Contributors
     Copyright (c) 1997-2006, Destroyer Studios LLC.
 
-     AUTHOR:       John DiCamillo
+    AUTHOR:       John DiCamillo
 
 
-     OVERVIEW
-     ========
-     Network Server Pump for HTTP Server
+    OVERVIEW
+    ========
+    Network Server Pump for HTTP Server
 */
 
-
 #ifndef HttpServletExec_h
 #define HttpServletExec_h
 
-#include "HttpServer.h"
-
-// +-------------------------------------------------------------------+
+#include <windows.h>
 
-class HttpServlet;
-class HttpSession;
+#include "HttpRequest.h"
+#include "HttpResponse.h"
+#include "HttpServer.h"
+#include "HttpServlet.h"
+#include "HttpSession.h"
+#include "List.h"
 
-// +-------------------------------------------------------------------+
 
 class HttpServletExec : public HttpServer
 {
@@ -53,4 +53,5 @@ protected:
     bool                 exec_shutdown;
 };
 
+
 #endif  // HttpServletExec_h