diff options
| author | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2015-11-22 17:14:09 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-12-16 17:00:45 +0000 |
| commit | 5616d22b57a9a5e57d545e912e029162a230829b (patch) | |
| tree | 04c53f1049995abf5f1b67533c30c5c7f0c8387a | |
| parent | 04f7270236ddac1d02187d5a8c24ed70000c73a5 (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>
(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>
| -rw-r--r-- | ucb/source/ucp/webdav-neon/webdavcontent.cxx | 8 |
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 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 + } } } |