[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - ucb/source

[Jan-Marek Glogowski (via logerrit)]

 ucb/source/ucp/webdav-curl/CurlSession.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 220095cfcb355a81f65472e73476099504e0e531
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Tue Nov 30 22:47:02 2021 +0100
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Wed Dec 1 12:34:22 2021 +0100

    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 <glo...@fbihome.de>
    (cherry picked from commit 70a479abe267c0bd4c0c0fd1e945d8e6e4856af2)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126132
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx 
b/ucb/source/ucp/webdav-curl/CurlSession.cxx
index d63d3566bfaa..59f372fa809b 100644
--- a/ucb/source/ucp/webdav-curl/CurlSession.cxx
+++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx
@@ -945,7 +945,10 @@ 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:
+#endif
                 throw DAVException(
                     DAVException::DAV_HTTP_CONNECT,
                     ConnectionEndPointString(rSession.m_URI.GetHost(), 
rSession.m_URI.GetPort()));