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

3 files changed, 36 insertions, 4 deletions

diff --git a/src/zenhttp/httpclient.cpp b/src/zenhttp/httpclient.cpp
index 5ae5f78d6..caefce5f4 100644
--- a/src/zenhttp/httpclient.cpp
+++ b/src/zenhttp/httpclient.cpp
@@ -587,11 +587,11 @@ HttpClient::Delete(std::string_view Url, const KeyValueMap& AdditionalHeader)
 }
 
 HttpClient::Response
-HttpClient::Post(std::string_view Url, const KeyValueMap& AdditionalHeader)
+HttpClient::Post(std::string_view Url, const KeyValueMap& AdditionalHeader, const KeyValueMap& Parameters)
 {
 	ZEN_TRACE_CPU("HttpClient::PostNoPayload");
 
-	Impl::Session Sess = m_Impl->AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {});
+	Impl::Session Sess = m_Impl->AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, Parameters);
 
 	return CommonResponse(Sess.Post());
 }
diff --git a/src/zenhttp/httpsys.cpp b/src/zenhttp/httpsys.cpp
index 3bcaa5861..f95a31914 100644
--- a/src/zenhttp/httpsys.cpp
+++ b/src/zenhttp/httpsys.cpp
@@ -877,8 +877,11 @@ HttpSysServer::InitializeServer(int BasePort)
 
 	HTTP_BINDING_INFO HttpBindingInfo = {{0}, 0};
 
+	WideStringBuilder<64> QueueName;
+	QueueName << "zenserver_" << EffectivePort;
+
 	Result = HttpCreateRequestQueue(HTTPAPI_VERSION_2,
-									/* Name */ nullptr,
+									/* Name */ QueueName.c_str(),
 									/* SecurityAttributes */ nullptr,
 									/* Flags */ 0,
 									&m_RequestQueueHandle);
@@ -902,6 +905,20 @@ HttpSysServer::InitializeServer(int BasePort)
 		return EffectivePort;
 	}
 
+	// Configure rejection method. Default is to drop the connection, it's better if we
+	// return an explicit error code when the queue cannot accept more requests
+
+	{
+		HTTP_503_RESPONSE_VERBOSITY VerbosityInformation = Http503ResponseVerbosityLimited;
+
+		Result = HttpSetRequestQueueProperty(m_RequestQueueHandle,
+											 HttpServer503VerbosityProperty,
+											 &VerbosityInformation,
+											 sizeof VerbosityInformation,
+											 0,
+											 0);
+	}
+
 	// Create I/O completion port
 
 	std::error_code ErrorCode;
@@ -918,6 +935,21 @@ HttpSysServer::InitializeServer(int BasePort)
 		ZEN_INFO("Started http.sys server at '{}'", WideToUtf8(m_BaseUris.front()));
 	}
 
+	// This is not available in all Windows SDK versions so for now we can't use recently
+	// released functionality. We should investigate how to get more recent SDK releases
+	// into the build
+
+#	if 0	
+	if (HttpIsFeatureSupported(/* HttpFeatureHttp3 */ (HTTP_FEATURE_ID) 4))
+	{
+		ZEN_DEBUG("HTTP3 is available");
+	}
+	else
+	{
+		ZEN_DEBUG("HTTP3 is NOT available");
+	}
+#	endif
+
 	return EffectivePort;
 }
 
diff --git a/src/zenhttp/include/zenhttp/httpclient.h b/src/zenhttp/include/zenhttp/httpclient.h
index 2c81f4a23..044a3162e 100644
--- a/src/zenhttp/include/zenhttp/httpclient.h
+++ b/src/zenhttp/include/zenhttp/httpclient.h
@@ -128,7 +128,7 @@ public:
 	[[nodiscard]] Response Get(std::string_view Url, const KeyValueMap& AdditionalHeader = {}, const KeyValueMap& Parameters = {});
 	[[nodiscard]] Response Head(std::string_view Url, const KeyValueMap& AdditionalHeader = {});
 	[[nodiscard]] Response Delete(std::string_view Url, const KeyValueMap& AdditionalHeader = {});
-	[[nodiscard]] Response Post(std::string_view Url, const KeyValueMap& AdditionalHeader = {});
+	[[nodiscard]] Response Post(std::string_view Url, const KeyValueMap& AdditionalHeader = {}, const KeyValueMap& Parameters = {});
 	[[nodiscard]] Response Post(std::string_view Url, const IoBuffer& Payload, const KeyValueMap& AdditionalHeader = {});
 	[[nodiscard]] Response Post(std::string_view Url, CbObject Payload, const KeyValueMap& AdditionalHeader = {});
 	[[nodiscard]] Response Post(std::string_view Url, CbPackage Payload, const KeyValueMap& AdditionalHeader = {});