wsd/Storage.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit df0dd1644579dbf767f573fc172da8962a4cc232
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Oct 9 12:17:33 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Oct 9 12:17:33 2019 +0200
Fix the SSL termination case
Follow up commit of d597f22dac9042c3917d3b105adc810b6900d52c
Change-Id: I41ca46a93f4b82c6fea6489dbd4c0e3390ba652f
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 49e804b89..ab6e51cfc 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -392,12 +392,12 @@ Poco::Net::HTTPClientSession*
StorageBase::getHTTPClientSession(const Poco::URI&
// We decoupled the Wopi communication from client communcation because
// the Wopi communication must have an independent policy.
// So, we will use here only Storage settings.
- return (SSLEnabled)
+ return (SSLEnabled || LOOLWSD::isSSLTermination())
? new Poco::Net::HTTPSClientSession(uri.getHost(), uri.getPort(),
Poco::Net::SSLManager::instance().defaultClientContext())
: new Poco::Net::HTTPClientSession(uri.getHost(), uri.getPort());
}
-
+
namespace
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
