diff options
| author | Stefan Boberg <[email protected]> | 2026-03-14 11:06:46 +0100 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2026-03-14 11:06:46 +0100 |
| commit | f21bf3327fb1c67b1ec921b04bee771e2f4ac1c0 (patch) | |
| tree | a4fbb1e2144831ca0be0d2816200ec77eac5bf1a /src/zenhttp/httpserver.cpp | |
| parent | added GetUid asan suppression (diff) | |
| parent | Made CPR optional, html generated at build time (#840) (diff) | |
| download | zen-f21bf3327fb1c67b1ec921b04bee771e2f4ac1c0.tar.xz zen-f21bf3327fb1c67b1ec921b04bee771e2f4ac1c0.zip | |
Merge main into sb/sessionize
Resolve html.zip conflict by accepting deletion from main.
Diffstat (limited to 'src/zenhttp/httpserver.cpp')
| -rw-r--r-- | src/zenhttp/httpserver.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/zenhttp/httpserver.cpp b/src/zenhttp/httpserver.cpp index 6ba0ca563..672467f56 100644 --- a/src/zenhttp/httpserver.cpp +++ b/src/zenhttp/httpserver.cpp @@ -2,6 +2,8 @@ #include <zenhttp/httpserver.h> +#include <zencore/filesystem.h> + #include "servers/httpasio.h" #include "servers/httpmulti.h" #include "servers/httpnull.h" @@ -1157,7 +1159,7 @@ CreateHttpServerClass(const std::string_view ServerClass, const HttpServerConfig ZEN_INFO("using asio HTTP server implementation") return CreateHttpAsioServer(AsioConfig { .ThreadCount = Config.ThreadCount, .ForceLoopback = Config.ForceLoopback, .IsDedicatedServer = Config.IsDedicatedServer, - .NoNetwork = Config.NoNetwork, .UnixSocketPath = Config.UnixSocketPath, + .NoNetwork = Config.NoNetwork, .UnixSocketPath = PathToUtf8(Config.UnixSocketPath), #if ZEN_USE_OPENSSL .HttpsPort = Config.HttpsPort, .CertFile = Config.CertFile, .KeyFile = Config.KeyFile, #endif |