[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - wsd/RequestDetails.cpp

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Mon Jun 8 20:02:16 UTC 2020


 wsd/RequestDetails.cpp |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 2e51ecb0a4e81b3370a52bc214cf377e58570eec
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Jun 5 14:20:47 2020 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Jun 8 22:01:58 2020 +0200

    Avoid assertion failure in the iOS app
    
    Change-Id: I5e0733579db01616f8c6e7743bb01a9a2feca8aa
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95591
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95768
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/wsd/RequestDetails.cpp b/wsd/RequestDetails.cpp
index 5249b8470..d97371578 100644
--- a/wsd/RequestDetails.cpp
+++ b/wsd/RequestDetails.cpp
@@ -74,13 +74,16 @@ RequestDetails::RequestDetails(Poco::Net::HTTPRequest &request)
 }
 
 RequestDetails::RequestDetails(const std::string &mobileURI)
-    : _isGet(false)
+    : _isGet(true)
     , _isHead(false)
     , _isProxy(false)
     , _isWebSocket(false)
 {
     _isMobile = true;
     _uriString = mobileURI;
+    // Not sure if these are correct in the case of file names that need URI-encoding.
+    _fields[Field::LegacyDocumentURI] = _uriString;
+    _fields[Field::DocumentURI] = _uriString;
 }
 
 std::string RequestDetails::getDocumentURI() const


More information about the Libreoffice-commits mailing list