[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp loolwsd/loolwsd.xml.in

[Jan Holesovsky]

 loolwsd/LOOLWSD.cpp    |    4 ++++
 loolwsd/loolwsd.xml.in |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit e41e10750070210103b1a92b2905d38f38a74a2f
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Sep 1 16:24:22 2016 +0200

    Fix --disable-ssl case.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index db7f135..c2c7068 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1439,7 +1439,11 @@ void LOOLWSD::initialize(Application& self)
         Log::warn("SSL support: SSL is disabled.");
     }
 
+#if ENABLE_SSL
     LOOLWSD::SSLTermination.set(getConfigValue<bool>(conf, "ssl.termination", true));
+#else
+    LOOLWSD::SSLTermination.set(false);
+#endif
 
     Cache = getPathFromConfig("tile_cache_path");
     SysTemplate = getPathFromConfig("sys_template_path");
diff --git a/loolwsd/loolwsd.xml.in b/loolwsd/loolwsd.xml.in
index 2cbf667..6ddba26 100644
--- a/loolwsd/loolwsd.xml.in
+++ b/loolwsd/loolwsd.xml.in
@@ -35,7 +35,7 @@
 
     <ssl desc="SSL settings">
         <enable type="bool" default="true">true</enable>
-        <termination type="bool" default="true">true</termination>
+        <termination desc="Connection via proxy where loolwsd acts as working via https, but actually uses http." type="bool" default="true">true</termination>
         <cert_file_path desc="Path to the cert file" relative="false">/etc/loolwsd/cert.pem</cert_file_path>
         <key_file_path desc="Path to the key file" relative="false">/etc/loolwsd/key.pem</key_file_path>
         <ca_file_path desc="Path to the ca file" relative="false">/etc/loolwsd/ca-chain.cert.pem</ca_file_path>