wsd/LOOLWSD.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9f31063bd619345c7e33f16a2c282bdcae365de1
Author: Michael Meeks <michael.me...@collabora.com>
AuthorDate: Thu Nov 8 02:10:03 2018 +0000
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Thu Nov 8 02:12:02 2018 +0000
Don't sniff the inside of SSL sockets for SSL headers.
We might find a websocket we don't like.
Change-Id: Id13628252e01501d6cc209f4d572d8da16a7a658
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 15a9c9c0a..438004b7f 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2008,7 +2008,7 @@ private:
std::shared_ptr<StreamSocket> socket = _socket.lock();
#ifndef MOBILEAPP
- if (socket->sniffSSL())
+ if (!LOOLWSD::isSSLEnabled() && socket->sniffSSL())
{
LOG_ERR("Looks like SSL/TLS traffic on plain http port");
std::ostringstream oss;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
