diff --git a/Debug/main.cpp.o b/Debug/main.cpp.o
index a3ba963..04f4bb1 100644
Binary files a/Debug/main.cpp.o and b/Debug/main.cpp.o differ
diff --git a/Debug/main.cpp.o.d b/Debug/main.cpp.o.d
index 536a531..487d2a0 100644
--- a/Debug/main.cpp.o.d
+++ b/Debug/main.cpp.o.d
@@ -1,39 +1,46 @@
Debug/main.cpp.o: main.cpp ../ServerCore/includes ../ServerCore/EPoll.h \
- ../ServerCore/Log.h ../ServerCore/includes ../ServerCore/File.h \
- ../ServerCore/Object.h ../ServerCore/Socket.h ../ServerCore/Thread.h \
+ ../CoreUtils/Log.h ../CoreUtils/includes ../CoreUtils/File.h \
+ ../ServerCore/Object.h ../ServerCore/includes ../CoreUtils/LogListener.h \
+ ../ServerCore/Socket.h ../ServerCore/Object.h ../ServerCore/Thread.h \
../ServerCore/Session.h ../ServerCore/TCPSocket.h \
../ServerCore/IPAddress.h ../ServerCore/SessionFilter.h \
- ../ServerCore/Command.h ../ServerCore/ConsoleServer.h \
- ../ServerCore/TCPServerSocket.h ../ServerCore/Service.h \
- ../ServerCore/CommandList.h ../ServerCore/IPAddressList.h \
- ../ServerCore/EPoll.h ../ServerCore/Exception.h ../ServerCore/File.h \
- ../ServerCore/Log.h ../ServerCore/IPAddress.h HTTPService.h \
- ../ServerCore/Service.h HTTPSessions.h HTTPRequest.h \
- ../CoreUtils/PString.h ../CoreUtils/includes ../CoreUtils/IMFMessage.h \
- ../CoreUtils/PString.h ../CoreUtils/IMFHeader.h \
- ../CoreUtils/IMFRequest.h ../CoreUtils/IMFBody.h \
- ../CoreUtils/IMFRequest.h ../CoreUtils/IMFResponse.h \
- ../CoreUtils/IMFMessage.h HTTPPageList.h ../ServerCore/Session.h \
- __index.h HTTPPage.h HTTPSession.h ../JET/Variables.h __script.h \
- __editview.h __style.h __setupadmin.h __favicon_ico.h __welcome.h \
+ ../ServerCore/Command.h ../ServerCore/ConsoleService.h \
+ ../ServerCore/Service.h ../ServerCore/CommandList.h \
+ ../ServerCore/ConsoleSession.h ../ServerCore/TerminalSession.h \
+ ../ServerCore/TCPServerSocket.h ../ServerCore/IPAddressList.h \
+ ../CoreUtils/Exception.h ../CoreUtils/File.h ../ServerCore/IPAddress.h \
+ HTTPService.h ../ServerCore/Service.h HTTPSessions.h HTTPRequest.h \
+ ../CoreUtils/PString.h ../CoreUtils/IMFMessage.h ../CoreUtils/PString.h \
+ ../CoreUtils/IMFHeader.h ../CoreUtils/IMFRequest.h \
+ ../CoreUtils/IMFBody.h ../CoreUtils/IMFRequest.h \
+ ../CoreUtils/IMFResponse.h ../CoreUtils/IMFMessage.h \
+ ../ServerCore/Command.h ../ServerCore/Session.h HTTPPageList.h __index.h \
+ HTTPPage.h HTTPSession.h ../JET/Variables.h __script.h __editview.h \
+ __style.h __setupadmin.h __favicon_ico.h __welcome.h \
../BMAMySQL/BMAMySQL.h __mainmenu.h __newview.h __configure.h \
__viewlist.h ../CoreUtils/Directory.h ../CoreUtils/DirectoryEntry.h \
- HTTPHandler.h ../ServerCore/Command.h
+ HTTPHandler.h
../ServerCore/includes:
../ServerCore/EPoll.h:
-../ServerCore/Log.h:
+../CoreUtils/Log.h:
-../ServerCore/includes:
+../CoreUtils/includes:
-../ServerCore/File.h:
+../CoreUtils/File.h:
../ServerCore/Object.h:
+../ServerCore/includes:
+
+../CoreUtils/LogListener.h:
+
../ServerCore/Socket.h:
+../ServerCore/Object.h:
+
../ServerCore/Thread.h:
../ServerCore/Session.h:
@@ -46,23 +53,23 @@ Debug/main.cpp.o: main.cpp ../ServerCore/includes ../ServerCore/EPoll.h \
../ServerCore/Command.h:
-../ServerCore/ConsoleServer.h:
-
-../ServerCore/TCPServerSocket.h:
+../ServerCore/ConsoleService.h:
../ServerCore/Service.h:
../ServerCore/CommandList.h:
+../ServerCore/ConsoleSession.h:
+
+../ServerCore/TerminalSession.h:
+
+../ServerCore/TCPServerSocket.h:
+
../ServerCore/IPAddressList.h:
-../ServerCore/EPoll.h:
+../CoreUtils/Exception.h:
-../ServerCore/Exception.h:
-
-../ServerCore/File.h:
-
-../ServerCore/Log.h:
+../CoreUtils/File.h:
../ServerCore/IPAddress.h:
@@ -76,8 +83,6 @@ HTTPRequest.h:
../CoreUtils/PString.h:
-../CoreUtils/includes:
-
../CoreUtils/IMFMessage.h:
../CoreUtils/PString.h:
@@ -94,10 +99,12 @@ HTTPRequest.h:
../CoreUtils/IMFMessage.h:
-HTTPPageList.h:
+../ServerCore/Command.h:
../ServerCore/Session.h:
+HTTPPageList.h:
+
__index.h:
HTTPPage.h:
@@ -133,5 +140,3 @@ __viewlist.h:
../CoreUtils/DirectoryEntry.h:
HTTPHandler.h:
-
-../ServerCore/Command.h:
diff --git a/HTTPHandler.cpp b/HTTPHandler.cpp
index 2e9cfc7..33415e7 100644
--- a/HTTPHandler.cpp
+++ b/HTTPHandler.cpp
@@ -10,19 +10,18 @@ namespace http {
int HTTPHandler::processCommand(std::string request, core::Session *session, std::stringstream &data) {
- core::Log(core::LOG_DEBUG_1) << request;
-
coreutils::PString request1(request);
HTTPRequest httpRequest(request1);
HTTPSession *httpSession = ((HTTPService &)session->service).httpSessions.findSessionByHeader(httpRequest);
std::stringstream content;
+
if(((HTTPService &)session->service).pageList.processRequest(httpRequest, session, httpSession, content)) {
std::string contentType = httpRequest.getHeader("Content-Type");
if(contentType == "multipart/form-data") {
coreutils::IMFFormData *formdata = (coreutils::IMFFormData *)httpRequest.getBody();
- core::Log(core::LOG_DEBUG_2) << "username is " << formdata->getByName("username") << std::endl;
+ coreutils::Log(coreutils::LOG_DEBUG_2) << "username is '" << formdata->getByName("username") << "'";
}
httpRequest.response.setCode("200");
diff --git a/HTTPPageCache.h b/HTTPPageCache.h
new file mode 100644
index 0000000..d31a922
--- /dev/null
+++ b/HTTPPageCache.h
@@ -0,0 +1,17 @@
+#ifndef __HTTPPageCache_h__
+#define __HTTPPageCache_h__
+
+namespace http {
+
+ class HTTPPageCache {
+
+ public:
+ std::string
+
+
+
+ };
+
+}
+
+#endif
diff --git a/HTTPServer.mk b/HTTPServer.mk
index 69562ee..51715dc 100644
--- a/HTTPServer.mk
+++ b/HTTPServer.mk
@@ -13,7 +13,7 @@ CurrentFileName :=
CurrentFilePath :=
CurrentFileFullPath :=
User :=Brad Arant
-Date :=16/08/19
+Date :=12/09/19
CodeLitePath :=/home/bradarant/.codelite
LinkerName :=/usr/bin/x86_64-linux-gnu-g++
SharedObjectLinkerName :=/usr/bin/x86_64-linux-gnu-g++ -shared -fPIC
diff --git a/HTTPServer.project b/HTTPServer.project
index ca56cff..32454eb 100644
--- a/HTTPServer.project
+++ b/HTTPServer.project
@@ -26,6 +26,7 @@