Commit | Line | Data |
---|---|---|
152d6bf0 EF |
1 | https://github.com/geometer/FBReader/commit/b7c78e965d06f78043a57e230c866c3af3f5a1eb.patch |
2 | https://github.com/geometer/FBReader/issues/310 | |
3 | https://github.com/geometer/FBReader/pull/311/commits | |
4 | ||
5 | From b7c78e965d06f78043a57e230c866c3af3f5a1eb Mon Sep 17 00:00:00 2001 | |
6 | From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com> | |
7 | Date: Sun, 9 Dec 2018 10:18:03 +0100 | |
8 | Subject: [PATCH] fix compatibility with curl-7.62 | |
9 | ||
10 | https://github.com/curl/curl/commit/3f3b26d6fe | |
11 | --- | |
12 | zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp | 2 ++ | |
13 | 1 file changed, 2 insertions(+) | |
14 | ||
15 | diff --git a/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp b/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp | |
16 | index 54cc37f6c..03e2a5721 100644 | |
17 | --- a/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp | |
18 | +++ b/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp | |
19 | @@ -285,9 +285,11 @@ std::string ZLCurlNetworkManager::perform(const ZLExecutionData::Vector &dataLis | |
20 | #endif | |
21 | errors.insert(ZLStringUtil::printf(errorResource["peerFailedVerificationMessage"].value(), ZLNetworkUtil::hostFromUrl(url))); | |
22 | break; | |
23 | +#if LIBCURL_VERSION_NUM < 0x073e00 | |
24 | case CURLE_SSL_CACERT: | |
25 | errors.insert(ZLStringUtil::printf(errorResource["sslCertificateAuthorityMessage"].value(), ZLNetworkUtil::hostFromUrl(url))); | |
26 | break; | |
27 | +#endif | |
28 | case CURLE_SSL_CACERT_BADFILE: | |
29 | errors.insert(ZLStringUtil::printf(errorResource["sslBadCertificateFileMessage"].value(), request.sslCertificate().Path)); | |
30 | break; |