Changeset 73851 in vbox for trunk/src

Timestamp:

Aug 22, 2018 10:51:53 PM (6 years ago)

Author:

vboxsync

Message:

http-curl.cpp: revert r124526. We still need to support systems with
old curl that doesn't have CURLOPT_XFERINFOFUNCTION.

File:

• trunk/src/VBox/Runtime/generic/http-curl.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/generic/http-curl.cpp

@@ -2180 +2180 @@
  * cURL callback for reporting progress, we use it for checking for abort.
  */
-static int rtHttpProgress(void *pData,
-                          curl_off_t rdTotalDownload, curl_off_t rdDownloaded,
-                          curl_off_t rdTotalUpload, curl_off_t rdUploaded)
+static int rtHttpProgress(void *pData, double rdTotalDownload, double rdDownloaded, double rdTotalUpload, double rdUploaded)
 {
     PRTHTTPINTERNAL pThis = (PRTHTTPINTERNAL)pData;
@@ -2260 +2258 @@
      * Progress/abort.
      */
-    rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_XFERINFOFUNCTION, &rtHttpProgress);
+    rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_PROGRESSFUNCTION, &rtHttpProgress);
     if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
-    rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_XFERINFODATA, (void *)pThis);
+    rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_PROGRESSDATA, (void *)pThis);
     if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;