1 files changed, 34 insertions, 8 deletions

diff --git a/src/zenhttp/servers/httpplugin.cpp b/src/zenhttp/servers/httpplugin.cpp
index 31b0315d4..ad7ed259a 100644
--- a/src/zenhttp/servers/httpplugin.cpp
+++ b/src/zenhttp/servers/httpplugin.cpp
@@ -185,13 +185,17 @@ public:
 
 	const std::vector<IoBuffer>& ResponseBuffers() const { return m_ResponseBuffers; }
 	void						 SuppressPayload() { m_ResponseBuffers.resize(1); }
+	void						 SetContentTypeOverride(std::string Override) { m_ContentTypeOverride = std::move(Override); }
+	void						 SetContentRangeHeader(std::string V) { m_ContentRangeHeader = std::move(V); }
 
 	std::string_view GetHeaders();
 
 private:
-	uint16_t					 m_ResponseCode	 = 0;
-	bool						 m_IsKeepAlive	 = true;
-	HttpContentType				 m_ContentType	 = HttpContentType::kBinary;
+	uint16_t					 m_ResponseCode = 0;
+	bool						 m_IsKeepAlive	= true;
+	HttpContentType				 m_ContentType	= HttpContentType::kBinary;
+	std::string					 m_ContentTypeOverride;
+	std::string					 m_ContentRangeHeader;
 	uint64_t					 m_ContentLength = 0;
 	std::vector<IoBuffer>		 m_ResponseBuffers;
 	ExtendableStringBuilder<160> m_Headers;
@@ -246,10 +250,18 @@ HttpPluginResponse::GetHeaders()
 
 	if (m_Headers.Size() == 0)
 	{
+		std::string_view ContentTypeStr =
+			m_ContentTypeOverride.empty() ? MapContentTypeToString(m_ContentType) : std::string_view(m_ContentTypeOverride);
+
 		m_Headers << "HTTP/1.1 " << ResponseCode() << " " << ReasonStringForHttpResultCode(ResponseCode()) << "\r\n"
-				  << "Content-Type: " << MapContentTypeToString(m_ContentType) << "\r\n"
+				  << "Content-Type: " << ContentTypeStr << "\r\n"
 				  << "Content-Length: " << ContentLength() << "\r\n"sv;
 
+		if (!m_ContentRangeHeader.empty())
+		{
+			m_Headers << "Content-Range: " << m_ContentRangeHeader << "\r\n"sv;
+		}
+
 		if (!m_IsKeepAlive)
 		{
 			m_Headers << "Connection: close\r\n"sv;
@@ -669,6 +681,10 @@ HttpPluginServerRequest::WriteResponse(HttpResponseCode ResponseCode)
 	ZEN_MEMSCOPE(GetHttppluginTag());
 
 	m_Response.reset(new HttpPluginResponse(HttpContentType::kBinary));
+	if (!m_ContentRangeHeader.empty())
+	{
+		m_Response->SetContentRangeHeader(std::move(m_ContentRangeHeader));
+	}
 	std::array<IoBuffer, 0> Empty;
 
 	m_Response->InitializeForPayload((uint16_t)ResponseCode, Empty);
@@ -681,6 +697,14 @@ HttpPluginServerRequest::WriteResponse(HttpResponseCode ResponseCode, HttpConten
 	ZEN_MEMSCOPE(GetHttppluginTag());
 
 	m_Response.reset(new HttpPluginResponse(ContentType));
+	if (!m_ContentTypeOverride.empty())
+	{
+		m_Response->SetContentTypeOverride(std::move(m_ContentTypeOverride));
+	}
+	if (!m_ContentRangeHeader.empty())
+	{
+		m_Response->SetContentRangeHeader(std::move(m_ContentRangeHeader));
+	}
 	m_Response->InitializeForPayload((uint16_t)ResponseCode, Blobs);
 }
 
@@ -831,6 +855,7 @@ HttpPluginServerImpl::OnRun(bool IsInteractive)
 		ZEN_CONSOLE("Zen Server running (plugin HTTP). Press ESC or Q to quit");
 	}
 
+	bool ShutdownRequested = false;
 	do
 	{
 		if (IsInteractive && _kbhit() != 0)
@@ -844,18 +869,19 @@ HttpPluginServerImpl::OnRun(bool IsInteractive)
 			}
 		}
 
-		m_ShutdownEvent.Wait(WaitTimeout);
-	} while (!IsApplicationExitRequested());
+		ShutdownRequested = m_ShutdownEvent.Wait(WaitTimeout);
+	} while (!ShutdownRequested && !IsApplicationExitRequested());
 #	else
 	if (IsInteractive)
 	{
 		ZEN_CONSOLE("Zen Server running (plugin HTTP). Ctrl-C to quit");
 	}
 
+	bool ShutdownRequested = false;
 	do
 	{
-		m_ShutdownEvent.Wait(WaitTimeout);
-	} while (!IsApplicationExitRequested());
+		ShutdownRequested = m_ShutdownEvent.Wait(WaitTimeout);
+	} while (!ShutdownRequested && !IsApplicationExitRequested());
 #	endif
 }