From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 9 Dec 2022 08:33:06 +0000 (+0100)
Subject: Merge pull request #12297 from chbruyand/auth-ifurlup-byteslimit
X-Git-Tag: dnsdist-1.8.0-rc1~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=536e51e8571ec08f9ad75646f5531c8e9e59e2fc;p=thirdparty%2Fpdns.git

Merge pull request #12297 from chbruyand/auth-ifurlup-byteslimit

minicurl: fix missing CURLOPT_XFERINFOFUNCTION on old curl versions
---

536e51e8571ec08f9ad75646f5531c8e9e59e2fc
diff --cc pdns/minicurl.hh
index e8916de57e,52447a886a..861d390203
--- a/pdns/minicurl.hh
+++ b/pdns/minicurl.hh
@@@ -41,12 -41,16 +41,16 @@@ public
    std::string getURL(const std::string& str, const ComboAddress* rem=nullptr, const ComboAddress* src=nullptr, int timeout = 2, bool fastopen = false, bool verify = false, size_t byteslimit = 0);
    std::string postURL(const std::string& str, const std::string& postdata, MiniCurlHeaders& headers, int timeout = 2, bool fastopen = false, bool verify = false);
  private:
 -  CURL *d_curl;
 +  CURL *d_curl{};
    static size_t write_callback(char *ptr, size_t size, size_t nmemb, void *userdata);
+ #if defined(LIBCURL_VERSION_NUM) && LIBCURL_VERSION_NUM >= 0x072000 // 7.32.0
    static size_t progress_callback(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow);
+ #else
+   static size_t progress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
+ #endif
    std::string d_data;
 -  size_t d_byteslimit;
 -  struct curl_slist* d_header_list = nullptr;
 +  size_t d_byteslimit{};
 +  struct curl_slist* d_header_list{};
    void setupURL(const std::string& str, const ComboAddress* rem, const ComboAddress* src, int timeout, size_t byteslimit, bool fastopen, bool verify);
    void setHeaders(const MiniCurlHeaders& headers);
    void clearHeaders();