From 5616d22b57a9a5e57d545e912e029162a230829b Mon Sep 17 00:00:00 2001
From: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
Date: Sun, 22 Nov 2015 17:14:09 +0100
Subject: Fix tdf#90700 Notify connect timeout early.

Throws exception to manage timeout early in the first connection
sequence.

Change-Id: Ibf87f9d7607c808692509c694127266b6f542014
Reviewed-on: https://gerrit.libreoffice.org/20196
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 95958755cbbf8c6026b878703400d5d9ec1e6c98)
Reviewed-on: https://gerrit.libreoffice.org/20739
Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
---
 ucb/source/ucp/webdav-neon/webdavcontent.cxx | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'ucb')

diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index d00e2e871260..98d56e131bfa 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -3497,6 +3497,14 @@ Content::ResourceType Content::getResourceType(
                 *networkAccessAllowed = *networkAccessAllowed
                     && shouldAccessNetworkAfterException(e);
             }
+            // if the two net events below happen, something
+            // is going on to the connection so break the command flow
+            if ( ( e.getError() == DAVException::DAV_HTTP_TIMEOUT ) ||
+                 ( e.getError() == DAVException::DAV_HTTP_CONNECT ) )
+            {
+                cancelCommandExecution( e, xEnv );
+                // unreachable
+            }
         }
     }
 
-- 
cgit