[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp

Jan Holesovsky (via logerrit) logerrit at kemper.freedesktop.org
Mon May 25 13:36:13 UTC 2020


 wsd/LOOLWSD.cpp |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit cecf3922cb4c5270659b887fb22abce5f6c8b839
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Mon May 25 14:46:31 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon May 25 15:35:54 2020 +0200

    Adventise the proxy prefix support in /hosting/capabilities.
    
    Change-Id: I09e340b1ecb1580feffe66c53b79d91749f0f9af
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94790
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Tested-by: Jenkins
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 8c1f6b945..ca1f437b4 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3237,6 +3237,9 @@ private:
         // Set the product name
         capabilities->set("productName", APP_NAME);
 
+        // Set that this is a proxy.php-enabled instance
+        capabilities->set("hasProxyPrefix", LOOLWSD::IsProxyPrefixEnabled);
+
         std::ostringstream ostrJSON;
         capabilities->stringify(ostrJSON);
         return ostrJSON.str();


More information about the Libreoffice-commits mailing list