[Libreoffice-commits] online.git: loolwsd/FileServer.cpp

Pranav Kant pranavk at collabora.co.uk
Mon Aug 29 05:25:11 UTC 2016


 loolwsd/FileServer.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 06b869bb63f1b70e96603cd40d2911cc4b687e45
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Mon Aug 29 10:53:37 2016 +0530

    loolwsd: -Werror,-Wpointer-bool-conversion
    
    isSSLTermination() was added in b0619d387b88d439376852e06ccc49e41841a981
    
    Change-Id: I63a702023b6a096154b510653bed885331e8e22d

diff --git a/loolwsd/FileServer.cpp b/loolwsd/FileServer.cpp
index 9cce160..d56824f 100644
--- a/loolwsd/FileServer.cpp
+++ b/loolwsd/FileServer.cpp
@@ -209,7 +209,7 @@ void FileServerRequestHandler::preprocessFile(HTTPServerRequest& request, HTTPSe
 {
     HTMLForm form(request, request.stream());
 
-    const auto host = ((LOOLWSD::isSSLEnabled() || LOOLWSD::isSSLTermination) ? "wss://" : "ws://") + (LOOLWSD::ServerName.empty() ? request.getHost() : LOOLWSD::ServerName);
+    const auto host = ((LOOLWSD::isSSLEnabled() || LOOLWSD::isSSLTermination()) ? "wss://" : "ws://") + (LOOLWSD::ServerName.empty() ? request.getHost() : LOOLWSD::ServerName);
     const auto path = Poco::Path(LOOLWSD::FileServerRoot, getRequestPathname(request));
     Log::debug("Preprocessing file: " + path.toString());
 


More information about the Libreoffice-commits mailing list