Remove CachingApp hierarchy as quick fix for fuzzing

Author: uNetworkingAB

build.c

@@ -9,7 +9,7 @@ int main(int argc, char **argv) {
     char *CXX = strcpy(calloc(1024, 1), or_else(getenv("CXX"), "g++"));
     char *EXEC_SUFFIX = strcpy(calloc(1024, 1), maybe(getenv("EXEC_SUFFIX")));
 
-    char *EXAMPLE_FILES[] = {"EchoBody", "CachingApp", "HelloWorldThreaded", "Http3Server", "Broadcast", "HelloWorld", "Crc32", "ServerName",
+    char *EXAMPLE_FILES[] = {"EchoBody", "HelloWorldThreaded", "Http3Server", "Broadcast", "HelloWorld", "Crc32", "ServerName",
     "EchoServer", "BroadcastingEchoServer", "UpgradeSync", "UpgradeAsync", "ParameterRoutes"};
 
     strcat(CXXFLAGS, " -march=native -O3 -Wpedantic -Wall -Wextra -Wsign-conversion -Wconversion -std=c++20 -Isrc -IuSockets/src");

src/App.h

@@ -47,7 +47,7 @@ struct AsyncSocket {
     /* This guy is promiscuous */
     template <bool> friend struct HttpContext;
     template <bool, bool, typename> friend struct WebSocketContext;
-    template <bool, typename> friend struct TemplatedAppBase;
+    template <bool> friend struct TemplatedApp;
     template <bool, typename> friend struct WebSocketContextData;
     template <typename, typename> friend struct TopicTree;
     template <bool> friend struct HttpResponse;

src/AsyncSocket.h

@@ -35,7 +35,7 @@ template<bool> struct HttpResponse;
 
 template <bool SSL>
 struct HttpContext {
-    template<bool, typename> friend struct TemplatedAppBase;
+    template<bool> friend struct TemplatedApp;
     template<bool> friend struct HttpResponse;
 private:
     HttpContext() = delete;

src/HttpContext.h

@@ -31,7 +31,7 @@ template <bool SSL>
 struct alignas(16) HttpContextData {
     template <bool> friend struct HttpContext;
     template <bool> friend struct HttpResponse;
-    template <bool, typename> friend struct TemplatedAppBase;
+    template <bool> friend struct TemplatedApp;
 private:
     std::vector<MoveOnlyFunction<void(HttpResponse<SSL> *, int)>> filterHandlers;
 

src/HttpContextData.h

@@ -46,7 +46,7 @@ static const int HTTP_TIMEOUT_S = 10;
 template <bool SSL>
 struct HttpResponse : public AsyncSocket<SSL> {
     /* Solely used for getHttpResponseData() */
-    template <bool, typename> friend struct TemplatedAppBase;
+    template <bool> friend struct TemplatedApp;
     typedef AsyncSocket<SSL> Super;
 private:
     HttpResponseData<SSL> *getHttpResponseData() {

src/HttpResponse.h

@@ -29,7 +29,7 @@ namespace uWS {
 
 template <bool SSL, bool isServer, typename USERDATA>
 struct WebSocket : AsyncSocket<SSL> {
-    template <bool, typename> friend struct TemplatedAppBase;
+    template <bool> friend struct TemplatedApp;
     template <bool> friend struct HttpResponse;
 private:
     typedef AsyncSocket<SSL> Super;

src/WebSocket.h

@@ -27,7 +27,7 @@ namespace uWS {
 
 template <bool SSL, bool isServer, typename USERDATA>
 struct WebSocketContext {
-    template <bool, typename> friend struct TemplatedAppBase;
+    template <bool> friend struct TemplatedApp;
     template <bool, typename> friend struct WebSocketProtocol;
 private:
     WebSocketContext() = delete;