[Libreoffice-commits] online.git: wsd/ServerURL.hpp

[Michael Meeks (via logerrit)]

 wsd/ServerURL.hpp |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 73a002c783160d613a79638ff4a2295981be0a30
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Thu May 7 20:06:01 2020 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu May 7 22:29:25 2020 +0200

    Avoid unexpected exception in the iOS app
    
    Essentially restoring 5d0c8587 and mending 18c4301a1f
    
    Change-Id: I0219b61a20ee5b36ec32d62123e5c1d98c8e2af8
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93675
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/wsd/ServerURL.hpp b/wsd/ServerURL.hpp
index 647ca966d..bfe9992b4 100644
--- a/wsd/ServerURL.hpp
+++ b/wsd/ServerURL.hpp
@@ -26,7 +26,13 @@ class ServerURL
 public:
     ServerURL(const Poco::Net::HTTPRequest &request)
     {
+#if MOBILEAPP
+        (void)request;
+        // getHost fires an exception on mobile.
+        init("mobile", "");
+#else
         init(request.getHost(), request.get("ProxyPrefix", ""));
+#endif
     }
 
     explicit ServerURL()