restructured zenhttp (#472)

separating the http server implementations into a directory and moved diagsvcs into zenserver since it's somewhat hard-coded for it

16 files changed, 6 insertions, 7 deletions

diff --git a/src/zenhttp/httpserver.cpp b/src/zenhttp/httpserver.cpp
index 7ea7cf91d..cd62ea157 100644
--- a/src/zenhttp/httpserver.cpp
+++ b/src/zenhttp/httpserver.cpp
@@ -2,10 +2,9 @@
 
 #include <zenhttp/httpserver.h>
 
-#include "httpasio.h"
-#include "httpnull.h"
-#include "httpsys.h"
-
+#include "servers/httpasio.h"
+#include "servers/httpnull.h"
+#include "servers/httpsys.h"
 #include "zenhttp/httpplugin.h"
 
 #if ZEN_WITH_PLUGINS
diff --git a/src/zenhttp/httpasio.cpp b/src/zenhttp/servers/httpasio.cpp
index 0c6b189f9..0c6b189f9 100644
--- a/src/zenhttp/httpasio.cpp
+++ b/src/zenhttp/servers/httpasio.cpp
diff --git a/src/zenhttp/httpasio.h b/src/zenhttp/servers/httpasio.h
index 2366f3437..2366f3437 100644
--- a/src/zenhttp/httpasio.h
+++ b/src/zenhttp/servers/httpasio.h
diff --git a/src/zenhttp/httpnull.cpp b/src/zenhttp/servers/httpnull.cpp
index 658f51831..658f51831 100644
--- a/src/zenhttp/httpnull.cpp
+++ b/src/zenhttp/servers/httpnull.cpp
diff --git a/src/zenhttp/httpnull.h b/src/zenhttp/servers/httpnull.h
index 965e729f7..965e729f7 100644
--- a/src/zenhttp/httpnull.h
+++ b/src/zenhttp/servers/httpnull.h
diff --git a/src/zenhttp/httpparser.cpp b/src/zenhttp/servers/httpparser.cpp
index 6b987151a..6b987151a 100644
--- a/src/zenhttp/httpparser.cpp
+++ b/src/zenhttp/servers/httpparser.cpp
diff --git a/src/zenhttp/httpparser.h b/src/zenhttp/servers/httpparser.h
index 219ac351d..219ac351d 100644
--- a/src/zenhttp/httpparser.h
+++ b/src/zenhttp/servers/httpparser.h
diff --git a/src/zenhttp/httpplugin.cpp b/src/zenhttp/servers/httpplugin.cpp
index 2e934473e..2e934473e 100644
--- a/src/zenhttp/httpplugin.cpp
+++ b/src/zenhttp/servers/httpplugin.cpp
diff --git a/src/zenhttp/httpsys.cpp b/src/zenhttp/servers/httpsys.cpp
index c1b4717cb..c1b4717cb 100644
--- a/src/zenhttp/httpsys.cpp
+++ b/src/zenhttp/servers/httpsys.cpp
diff --git a/src/zenhttp/httpsys.h b/src/zenhttp/servers/httpsys.h
index 6a6b16525..6a6b16525 100644
--- a/src/zenhttp/httpsys.h
+++ b/src/zenhttp/servers/httpsys.h
diff --git a/src/zenhttp/iothreadpool.cpp b/src/zenhttp/servers/iothreadpool.cpp
index da4b42e28..da4b42e28 100644
--- a/src/zenhttp/iothreadpool.cpp
+++ b/src/zenhttp/servers/iothreadpool.cpp
diff --git a/src/zenhttp/iothreadpool.h b/src/zenhttp/servers/iothreadpool.h
index e75e95e58..e75e95e58 100644
--- a/src/zenhttp/iothreadpool.h
+++ b/src/zenhttp/servers/iothreadpool.h
diff --git a/src/zenhttp/xmake.lua b/src/zenhttp/xmake.lua
index 588fd8b87..e90fdfd1c 100644
--- a/src/zenhttp/xmake.lua
+++ b/src/zenhttp/xmake.lua
@@ -5,7 +5,7 @@ target('zenhttp')
     set_group("libs")
     add_headerfiles("**.h")
     add_files("**.cpp")
-    add_files("httpsys.cpp", {unity_ignored=true})
+    add_files("servers/httpsys.cpp", {unity_ignored=true})
     add_includedirs("include", {public=true})
     add_deps("zencore", "transport-sdk")
     add_packages(
diff --git a/src/zenhttp/diagsvcs.cpp b/src/zenserver/diag/diagsvcs.cpp
index 9a547aa47..93c2eafc3 100644
--- a/src/zenhttp/diagsvcs.cpp
+++ b/src/zenserver/diag/diagsvcs.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "zenhttp/diagsvcs.h"
+#include "diagsvcs.h"
 
 #include <zencore/compactbinary.h>
 #include <zencore/compactbinarybuilder.h>
diff --git a/src/zenhttp/include/zenhttp/diagsvcs.h b/src/zenserver/diag/diagsvcs.h
index 8cc869c83..8cc869c83 100644
--- a/src/zenhttp/include/zenhttp/diagsvcs.h
+++ b/src/zenserver/diag/diagsvcs.h
diff --git a/src/zenserver/zenserver.h b/src/zenserver/zenserver.h
index 0c28c1229..cc5b53cef 100644
--- a/src/zenserver/zenserver.h
+++ b/src/zenserver/zenserver.h
@@ -21,7 +21,6 @@ ZEN_THIRD_PARTY_INCLUDES_END
 
 #include <zenhttp/auth/authmgr.h>
 #include <zenhttp/auth/authservice.h>
-#include <zenhttp/diagsvcs.h>
 #include <zenhttp/httpstats.h>
 #include <zenhttp/httpstatus.h>
 #include <zenhttp/httptest.h>
@@ -29,6 +28,7 @@ ZEN_THIRD_PARTY_INCLUDES_END
 #include "admin/admin.h"
 #include "cache/httpstructuredcache.h"
 #include "cache/structuredcachestore.h"
+#include "diag/diagsvcs.h"
 #include "frontend/frontend.h"
 #include "httpcidstore.h"
 #include "objectstore/objectstore.h"