wsd/FileServer.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
New commits: commit 2c9966ed2ff022a4e92d141d2521978c5e284105 Author: Pranav Kant <[email protected]> Date: Thu Jun 22 16:13:17 2017 +0530 Bin unused header Change-Id: I2067e793fe54e7c713b6d319c1f13b95a09923a3 diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp index 5b628218..c4ece6f8 100644 --- a/wsd/FileServer.cpp +++ b/wsd/FileServer.cpp @@ -31,7 +31,6 @@ #include <Poco/Net/HTTPRequest.h> #include <Poco/Net/NameValueCollection.h> #include <Poco/Net/NetException.h> -#include <Poco/RegularExpression.h> #include <Poco/Runnable.h> #include <Poco/StreamCopier.h> #include <Poco/StringTokenizer.h> commit 2e42ae8c2f822f6c02de77bb0aebf064ad066a3e Author: Pranav Kant <[email protected]> Date: Thu Jun 22 13:15:36 2017 +0530 Enable HTTP key pinning when ssl termination is on too Change-Id: Id2d7a34374236f50e28551ff9c57433d9153e2fd diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp index 61776d52..5b628218 100644 --- a/wsd/FileServer.cpp +++ b/wsd/FileServer.cpp @@ -567,7 +567,7 @@ void FileServerRequestHandler::preprocessFile(const HTTPRequest& request, Poco:: oss << cspOss.str(); // Setup HTTP Public key pinning - if (LOOLWSD::isSSLEnabled() && config.getBool("ssl.hpkp[@enable]", false)) + if ((LOOLWSD::isSSLEnabled() || LOOLWSD::isSSLTermination()) && config.getBool("ssl.hpkp[@enable]", false)) { size_t i = 0; std::string pinPath = "ssl.hpkp.pins.pin[" + std::to_string(i) + "]"; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
