diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-03-28 16:02:15 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-03-28 16:02:15 +0300 |
| commit | d31415e89db08fff9770abb61e401d677ef4d2e9 (patch) | |
| tree | 7236fffe71ccb5c3b5ca8afcffb884217248c22c /loleaflet/dist | |
| parent | 790069ecbc31828c29eb2e19c8b843ee7471d7f6 (diff) | |
For some reason the small patch to wsd/FileServer.cpp is not needed any more
At least not for me, on Safari, against online master 'make run'
running on Linux.
Change-Id: Idd8c4b8e5db8540b85173b9c01859cce59bfe707
Diffstat (limited to 'loleaflet/dist')
| -rw-r--r-- | loleaflet/dist/framed.html | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/loleaflet/dist/framed.html b/loleaflet/dist/framed.html index 2dbdebbb6..f99180a09 100644 --- a/loleaflet/dist/framed.html +++ b/loleaflet/dist/framed.html @@ -16,32 +16,6 @@ to loleaflet in a unocommandresult: message, and passed on to the event listener on this page, which writes it to the output field. - For this to work, in the trivial proof of concept case of 'make - run', the below patch is needed to the C++ code. It is probably - not necessary in a "real" WOPI-based setup where iframes are - already used and things work fine. - ---- a/wsd/FileServer.cpp -+++ b/wsd/FileServer.cpp -@@ -172,7 +172,7 @@ void FileServerRequestHandler::handleRequest(const HTTPRequest& request, Poco::M - const auto& config = Application::instance().config(); - const std::string loleafletHtml = config.getString("loleaflet_html", "loleaflet.html"); - const std::string endPoint = requestSegments[requestSegments.size() - 1]; -- if (endPoint == loleafletHtml) -+ if (endPoint == loleafletHtml || endPoint == "framed.html") - { - preprocessFile(request, message, socket); - return; -@@ -548,7 +548,7 @@ void FileServerRequestHandler::preprocessFile(const HTTPRequest& request, Poco:: - LOG_TRC("Denied frame ancestor: " << frameAncestor); - - cspOss << "img-src 'self' data: ;"; -- oss << "X-Frame-Options: deny\r\n"; -+ oss << "X-Frame-Options: sameorigin\r\n"; - } - - cspOss << "\r\n"; - --> <html> @@ -179,6 +153,6 @@ the hex string needs to be changed of course, to the right one as shown by 'make run'. --> - <iframe src="http://snorken.local:9980/loleaflet/94781ec6/loleaflet.html?file_path=file:///home/tml/lo/internal-online/test/data/empty.ods&NotWOPIButIframe=true" height="1000" width="1000"></iframe> + <iframe src="http://snorken.local:9980/loleaflet/3304e9093/loleaflet.html?file_path=file:///home/tml/lo/online/test/data/empty.ods&NotWOPIButIframe=true" height="1000" width="1000"></iframe> </body> </html> |