loolwsd/FileServer.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0191bf7fc1a75fc3b680925b56a69033d9e64a7c
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun Jun 5 16:37:49 2016 +0200
loolwsd: respect server_name setting
(cherry picked from commit 7e625d5f423f9e6dff825f4fe12d7ac464de6cd6)
diff --git a/loolwsd/FileServer.hpp b/loolwsd/FileServer.hpp
index a4ca0b8..2d23a74 100644
--- a/loolwsd/FileServer.hpp
+++ b/loolwsd/FileServer.hpp
@@ -217,7 +217,7 @@ private:
{
HTMLForm form(request, request.stream());
- const auto host = (LOOLWSD::SSLEnabled? "wss://": "ws://") +
request.getHost();
+ const auto host = (LOOLWSD::SSLEnabled ? "wss://" : "ws://") +
(LOOLWSD::ServerName.empty() ? request.getHost() : LOOLWSD::ServerName);
const auto path = Poco::Path(LOOLWSD::FileServerRoot,
getRequestPathname(request));
Log::debug("Preprocessing file: " + path.toString());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
