loolwsd/LOOLWSD.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 324f72d844c49ad3ffb7a8447bf835a1d59fd20d
Author: Andras Timar <andras.ti...@collabora.com>
Date: Fri Apr 1 16:31:33 2016 +0200
Revert "serve loleaflet from apache2, until we solve access control problem"
This reverts commit 21cd9167c4ed9c0e716ecb3b00de626c456515dd.
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 8246a01..8174add 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -534,7 +534,7 @@ private:
const std::string mediaType = "text/xml";
const std::string action = "action";
const std::string urlsrc = "urlsrc";
- const std::string uriValue = "https://"; + uri.getHost() +
"/loleaflet/dist/loleaflet.html?";
+ const std::string uriValue = "https://"; + uri.getHost() + ":" +
std::to_string(uri.getPort()) + "/loleaflet/dist/loleaflet.html?";
InputSource inputSrc(discoveryPath);
AutoPtr<Poco::XML::Document> docXML = parser.parse(&inputSrc);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
