wsd/FileServer.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 050d8927eefdf5ed239fcab22059d11a2d271347
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Wed Jan 9 10:43:55 2019 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jan 9 13:47:52 2019 +0100
tdf#122451 CSP: Allow all ports of known hosts
Change-Id: I9cf628ffc3920c87187bac3d17e5036e3c7278fc
Reviewed-on: https://gerrit.libreoffice.org/65998
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
(cherry picked from commit 9d1c6f03cad9e6aa023807031b22aba6e9df4909)
Reviewed-on: https://gerrit.libreoffice.org/66023
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 5855491ff..705438016 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -687,7 +687,7 @@ void FileServerRequestHandler::preprocessFile(const
HTTPRequest& request, Poco::
std::string frameAncestors = configFrameAncestor;
Poco::URI uriHost(host);
if (uriHost.getHost() != configFrameAncestor)
- frameAncestors += " " + uriHost.getHost();
+ frameAncestors += " " + uriHost.getHost() + ":*";
for (const auto& param : params)
{
@@ -700,7 +700,7 @@ void FileServerRequestHandler::preprocessFile(const
HTTPRequest& request, Poco::
wopiFrameAncestor = uriWopiFrameAncestor.getHost();
if (wopiFrameAncestor != uriHost.getHost() && wopiFrameAncestor !=
configFrameAncestor)
{
- frameAncestors += " " + wopiFrameAncestor;
+ frameAncestors += " " + wopiFrameAncestor + ":*";
LOG_TRC("Picking frame ancestor from WOPISrc: " <<
wopiFrameAncestor);
}
break;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
