summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2021-11-30 22:47:02 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2021-12-01 08:39:54 +0100
commit70a479abe267c0bd4c0c0fd1e945d8e6e4856af2 (patch)
tree8daf515ca676efe3fb6b8c612cb103670f45d563 /ucb
parent9d3b636466ba113fa769cca786b8f70fe2a70789 (diff)
CURLE_QUIC_CONNECT_ERROR requires curl >= 7.69.0
This new error code replaced several CURLE_FAILED_INIT in curl commit cbb5429001084df4e71ebd95dbf748c3c302c9f7 ("ngtcp2: Add an error code for QUIC connection errors"). Instead of escalating the curl version further, just mask it with CURL_AT_LEAST_VERSION; this way my Ubuntu 20.04 schroot can still use the system CURL for the build... Change-Id: I24afd32737e2ab74d9e4ce1722012d522ae010bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126158 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/webdav-curl/CurlSession.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx b/ucb/source/ucp/webdav-curl/CurlSession.cxx
index d63d3566bfaa..5cde0fc027aa 100644
--- a/ucb/source/ucp/webdav-curl/CurlSession.cxx
+++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx
@@ -945,10 +945,13 @@ auto CurlProcessor::ProcessRequestImpl(
case CURLE_SSL_ISSUER_ERROR:
case CURLE_SSL_PINNEDPUBKEYNOTMATCH:
case CURLE_SSL_INVALIDCERTSTATUS:
+ case CURLE_FAILED_INIT:
+#if CURL_AT_LEAST_VERSION(7, 69, 0)
case CURLE_QUIC_CONNECT_ERROR:
throw DAVException(
DAVException::DAV_HTTP_CONNECT,
ConnectionEndPointString(rSession.m_URI.GetHost(), rSession.m_URI.GetPort()));
+#endif
case CURLE_REMOTE_ACCESS_DENIED:
case CURLE_LOGIN_DENIED:
case CURLE_AUTH_ERROR: