add basic HTTPS support for http.sys

1 files changed, 10 insertions, 3 deletions

diff --git a/src/zenhttp/httpserver.cpp b/src/zenhttp/httpserver.cpp
index bbb7cd695..029f7be1b 100644
--- a/src/zenhttp/httpserver.cpp
+++ b/src/zenhttp/httpserver.cpp
@@ -1043,13 +1043,16 @@ HttpServer::OnGetExternalHost() const
 std::string
 HttpServer::GetServiceUri(const HttpService* Service) const
 {
+	const char* Scheme = (m_EffectiveHttpsPort > 0) ? "https" : "http";
+	int			Port   = (m_EffectiveHttpsPort > 0) ? m_EffectiveHttpsPort : m_EffectivePort;
+
 	if (Service)
 	{
-		return fmt::format("http://{}:{}{}", m_ExternalHost, m_EffectivePort, Service->BaseUri());
+		return fmt::format("{}://{}:{}{}", Scheme, m_ExternalHost, Port, Service->BaseUri());
 	}
 	else
 	{
-		return fmt::format("http://{}:{}", m_ExternalHost, m_EffectivePort);
+		return fmt::format("{}://{}:{}", Scheme, m_ExternalHost, Port);
 	}
 }
 
@@ -1132,7 +1135,11 @@ CreateHttpServerClass(const std::string_view ServerClass, const HttpServerConfig
 													.IsAsyncResponseEnabled	 = Config.HttpSys.IsAsyncResponseEnabled,
 													.IsRequestLoggingEnabled = Config.HttpSys.IsRequestLoggingEnabled,
 													.IsDedicatedServer		 = Config.IsDedicatedServer,
-													.ForceLoopback			 = Config.ForceLoopback}));
+													.ForceLoopback			 = Config.ForceLoopback,
+													.HttpsPort				 = Config.HttpSys.HttpsPort,
+													.CertThumbprint			 = Config.HttpSys.CertThumbprint,
+													.CertStoreName			 = Config.HttpSys.CertStoreName,
+													.HttpsOnly				 = Config.HttpSys.HttpsOnly}));
 	}
 #endif
 	else if (ServerClass == "null"sv)