Merge branch 'main' of https://github.com/EpicGames/zen

1 files changed, 45 insertions, 3 deletions

diff --git a/zencore/httpserver.cpp b/zencore/httpserver.cpp
index 22cba4d75..1bfe224f8 100644
--- a/zencore/httpserver.cpp
+++ b/zencore/httpserver.cpp
@@ -929,6 +929,46 @@ HttpSysServer::RemoveEndpoint(const char* UrlPath, HttpService& Service)
 
 //////////////////////////////////////////////////////////////////////////
 
+using namespace std::literals;
+
+static constinit uint32_t HashBinary			   = HashStringDjb2("application/octet-stream"sv);
+static constinit uint32_t HashJson				   = HashStringDjb2("application/json"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);
+
+HttpContentType
+MapContentType(const std::string_view& ContentTypeString)
+{
+	if (!ContentTypeString.empty())
+	{
+		const uint32_t CtHash = HashStringDjb2(ContentTypeString);
+
+		if (CtHash == HashBinary)
+		{
+			return HttpContentType::kBinary;
+		}
+		else if (CtHash == HashCompactBinary)
+		{
+			return HttpContentType::kCbObject;
+		}
+		else if (CtHash == HashCompactBinaryPackage)
+		{
+			return HttpContentType::kCbPackage;
+		}
+		else if (CtHash == HashJson)
+		{
+			return HttpContentType::kJSON;
+		}
+		else if (CtHash == HashText)
+		{
+			return HttpContentType::kText;
+		}
+	}
+
+	return HttpContentType::kUnknownContentType;
+}
+
 class HttpSysServerRequest : public HttpServerRequest
 {
 public:
@@ -1000,10 +1040,12 @@ public:
 				break;
 		}
 
-		auto&			 clh = HttpRequestPtr->Headers.KnownHeaders[HttpHeaderContentLength];
-		std::string_view cl(clh.pRawValue, clh.RawValueLength);
-
+		const HTTP_KNOWN_HEADER& clh = HttpRequestPtr->Headers.KnownHeaders[HttpHeaderContentLength];
+		std::string_view		 cl(clh.pRawValue, clh.RawValueLength);
 		std::from_chars(cl.data(), cl.data() + cl.size(), m_ContentLength);
+
+		const HTTP_KNOWN_HEADER& CtHdr = HttpRequestPtr->Headers.KnownHeaders[HttpHeaderContentType];
+		m_ContentType				   = MapContentType({CtHdr.pRawValue, CtHdr.RawValueLength});
 	}
 
 	~HttpSysServerRequest() {}