summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorGiuseppe Castagno <giuseppe.castagno@acca-esse.eu>2015-11-22 17:14:09 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-12-14 12:05:58 +0000
commit95958755cbbf8c6026b878703400d5d9ec1e6c98 (patch)
tree0faaccce81cb6a0919fc0aba1e80b5f9847af6a1 /ucb
parentf0cf5557d7e309e84ec997b8bdd84c6d029271d2 (diff)
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>
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/webdav-neon/webdavcontent.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index f77b1ef61368..dfcf7ebd638b 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -3488,6 +3488,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
+ }
}
}