wsd/LOOLWSD.cpp | 2 --
1 file changed, 2 deletions(-)
New commits:
commit 7952bfc32f3ad978a3411ae6578c62528292c7b2
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Aug 21 09:13:01 2019 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Aug 21 09:13:01 2019 +0200
wsd: fix assertion failure on 'make run'
loolwsd: ./common/Util.hpp:918: void Util::RuntimeConstant<bool>::set(const
T &) [T = bool]: Assertion `!_initialized' failed.
Probably introduced in commit 3c1a130004845c99a159d634eb79474ff3c8d353
(wsd: fix build, with argument "--disable-ssl", 2019-08-20).
Change-Id: Ia7c310f1a8d6ed1b3b69bd91f9e117b97d15e7d7
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 7fa2072e7..6bf628632 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1030,7 +1030,6 @@ void LOOLWSD::initialize(Application& self)
#if ENABLE_SSL
LOOLWSD::SSLEnabled.set(getConfigValue<bool>(conf, "ssl.enable", true));
- LOOLWSD::SSLEnabled.set(false);
#endif
if (LOOLWSD::isSSLEnabled())
@@ -1044,7 +1043,6 @@ void LOOLWSD::initialize(Application& self)
#if ENABLE_SSL
LOOLWSD::SSLTermination.set(getConfigValue<bool>(conf, "ssl.termination",
true));
- LOOLWSD::SSLTermination.set(false);
#endif
std::string allowedLanguages(config().getString("allowed_languages"));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
