ucb/source/ucp/webdav-neon/webdavcontent.cxx | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit 95958755cbbf8c6026b878703400d5d9ec1e6c98
Author: Giuseppe Castagno <giuseppe.casta...@acca-esse.eu>
Date: Sun Nov 22 17:14:09 2015 +0100
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 <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index f77b1ef..dfcf7eb 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
+ }
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
