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

Michael Meeks (via logerrit) logerrit at kemper.freedesktop.org
Fri Apr 24 18:58:08 UTC 2020


 wsd/LOOLWSD.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 2bd440f2800187cea6b04058ec07e615ed71a19e
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Wed Apr 22 21:07:10 2020 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Apr 24 20:57:49 2020 +0200

    Proxy: detect isWaiting properly now we have requests serials.
    
    Change-Id: I76b2602192f1a49df73f4354bb26209fe2ed6d5d
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92820
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 38496b184..856eaa345 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2944,8 +2944,7 @@ private:
 
         std::string fullURL = request.getURI();
         std::string ending = "/ws/wait";
-        bool isWaiting = (fullURL.size() > ending.size() &&
-                          std::equal(ending.rbegin(), ending.rend(), fullURL.rbegin()));
+        bool isWaiting = fullURL.find(ending) != std::string::npos;
         if (docBroker)
         {
             // need to move into the DocumentBroker context before doing session lookup / creation etc.


More information about the Libreoffice-commits mailing list