[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - wsd/FileServer.cpp

[Libreoffice Gerrit user]

 wsd/FileServer.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit daaccabd1690709d3ce103161522e5ee47f30efd
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Sat Sep 8 00:10:50 2018 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Mon Sep 10 23:08:53 2018 +0200

    ServiceRoot: Fix the admin console (the jwt token generation).
    
    Change-Id: Ic1772692471d29c99d7d68834cddb6b304e721d2
    Reviewed-on: https://gerrit.libreoffice.org/60177
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index f1ccfecc9..5b3aed55b 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -252,7 +252,7 @@ bool FileServerRequestHandler::isAdminLoggedIn(const HTTPRequest& request,
 
     Poco::Net::HTTPCookie cookie("jwt", jwtToken);
     // bundlify appears to add an extra /dist -> dist/dist/admin
-    cookie.setPath("/loleaflet/dist/");
+    cookie.setPath(LOOLWSD::ServiceRoot + "/loleaflet/dist/");
     cookie.setSecure(LOOLWSD::isSSLEnabled() ||
                      LOOLWSD::isSSLTermination());
     response.addCookie(cookie);