Merged main

1 files changed, 34 insertions, 11 deletions

diff --git a/zenhttp/httpserver.cpp b/zenhttp/httpserver.cpp
index 8e5d61877..69974ca06 100644
--- a/zenhttp/httpserver.cpp
+++ b/zenhttp/httpserver.cpp
@@ -58,19 +58,25 @@ MapContentTypeToString(HttpContentType ContentType)
 
 		case HttpContentType::kYAML:
 			return "text/yaml"sv;
+
+		case HttpContentType::kHTML:
+			return "text/html"sv;
 	}
 }
 
 //////////////////////////////////////////////////////////////////////////
 
 static constinit uint32_t HashBinary					= HashStringDjb2("application/octet-stream"sv);
-static constinit uint32_t HashJson						= HashStringDjb2("application/json"sv);
-static constinit uint32_t HashYaml						= HashStringDjb2("text/yaml"sv);
+static constinit uint32_t HashApplicationJson			= HashStringDjb2("application/json"sv);
+static constinit uint32_t HashApplicationYaml			= HashStringDjb2("text/yaml"sv);
 static constinit uint32_t HashText						= HashStringDjb2("text/plain"sv);
 static constinit uint32_t HashCompactBinary				= HashStringDjb2("application/x-ue-cb"sv);
 static constinit uint32_t HashCompactBinaryPackage		= HashStringDjb2("application/x-ue-cbpkg"sv);
 static constinit uint32_t HashCompactBinaryPackageOffer = HashStringDjb2("application/x-ue-offer"sv);
 static constinit uint32_t HashCompressedBinary			= HashStringDjb2("application/x-ue-comp"sv);
+static constinit uint32_t HashJson						= HashStringDjb2("json"sv);
+static constinit uint32_t HashYaml						= HashStringDjb2("yaml"sv);
+static constinit uint32_t HashHtml						= HashStringDjb2("text/html"sv);
 
 std::once_flag InitContentTypeLookup;
 
@@ -78,14 +84,21 @@ struct HashedTypeEntry
 {
 	uint32_t		Hash;
 	HttpContentType Type;
-} TypeHashTable[] = {{HashBinary, HttpContentType::kBinary},
-					 {HashCompactBinary, HttpContentType::kCbObject},
-					 {HashCompactBinaryPackage, HttpContentType::kCbPackage},
-					 {HashCompactBinaryPackageOffer, HttpContentType::kCbPackageOffer},
-					 {HashJson, HttpContentType::kJSON},
-					 {HashYaml, HttpContentType::kYAML},
-					 {HashText, HttpContentType::kText},
-					 {HashCompressedBinary, HttpContentType::kCompressedBinary}};
+} TypeHashTable[] = {
+	// clang-format off
+	{HashBinary,					HttpContentType::kBinary},
+	{HashCompactBinary,				HttpContentType::kCbObject},
+	{HashCompactBinaryPackage,		HttpContentType::kCbPackage},
+	{HashCompactBinaryPackageOffer, HttpContentType::kCbPackageOffer},
+	{HashJson,						HttpContentType::kJSON},
+	{HashApplicationJson,			HttpContentType::kJSON},
+	{HashYaml,						HttpContentType::kYAML},
+	{HashApplicationYaml,			HttpContentType::kYAML},
+	{HashText,						HttpContentType::kText},
+	{HashCompressedBinary,			HttpContentType::kCompressedBinary},
+	{HashHtml,						HttpContentType::kHTML},
+	// clang-format on
+};
 
 HttpContentType
 ParseContentTypeImpl(const std::string_view& ContentTypeString)
@@ -117,6 +130,16 @@ ParseContentTypeInit(const std::string_view& ContentTypeString)
 		std::sort(std::begin(TypeHashTable), std::end(TypeHashTable), [](const HashedTypeEntry& Lhs, const HashedTypeEntry& Rhs) {
 			return Lhs.Hash < Rhs.Hash;
 		});
+
+		// validate that there are no hash collisions
+
+		uint32_t LastHash = 0;
+
+		for (const auto& Item : TypeHashTable)
+		{
+			ZEN_ASSERT(LastHash != Item.Hash);
+			LastHash = Item.Hash;
+		}
 	});
 
 	ParseContentType = ParseContentTypeImpl;
@@ -548,7 +571,7 @@ CreateHttpServer()
 #if 0
 	return new HttpUwsServer;
 #elif ZEN_WITH_HTTPSYS
-	return new HttpSysServer{std::thread::hardware_concurrency()};
+	return new HttpSysServer(std::thread::hardware_concurrency(), /* background worker threads */ 16);
 #else
 	return new HttpNullServer;
 #endif