Kaydet (Commit) 5616d22b authored tarafından Giuseppe Castagno's avatar Giuseppe Castagno Kaydeden (comit) Miklos Vajna

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/20196Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 95958755)
Reviewed-on: https://gerrit.libreoffice.org/20739Reviewed-by: 's avatarGiuseppe Castagno <giuseppe.castagno@acca-esse.eu>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 04f72702
...@@ -3497,6 +3497,14 @@ Content::ResourceType Content::getResourceType( ...@@ -3497,6 +3497,14 @@ Content::ResourceType Content::getResourceType(
*networkAccessAllowed = *networkAccessAllowed *networkAccessAllowed = *networkAccessAllowed
&& shouldAccessNetworkAfterException(e); && 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
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment