Changeset 74091 in vbox

Timestamp:

Sep 5, 2018 5:58:31 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/http: New read/write callbacks APIs (untested). bugref:9167 [build fix]

Location:

trunk

Files:

• include/iprt/http.h (modified) (3 diffs)
• src/VBox/Runtime/generic/http-curl.cpp (modified) (2 diffs)

trunk/include/iprt/http.h

@@ -464 +464 @@
  *          call this method for different status codes.  Only the last one
  *          with be honored.
+ *
+ * @note    This only works reliably with RTHttpPerform at the moment.
  */
 RTR3DECL(int) RTHttpSetDownloadCallback(RTHTTP hHttp, uint32_t fFlags, PFNRTHTTPDOWNLOADCALLBACK pfnCallback, void *pvUser);
@@ -501 +503 @@
  * @param   pfnCallback     The callback function.  Pass NULL to reset the callback.
  * @param   pvUser          Convenience pointer for the callback function.
+ *
+ * @note    This only works reliably with RTHttpPerform at the moment.
  */
 RTR3DECL(int) RTHttpSetUploadCallback(RTHTTP hHttp, uint64_t cbContent, PFNRTHTTPUPLOADCALLBACK pfnCallback, void *pvUser);
@@ -528 +532 @@
  * @param   pfnCallback     The callback function.  Pass NULL to reset the callback.
  * @param   pvUser          Convenience pointer for the callback function.
+ *
+ * @note    This only works reliably with RTHttpPerform at the moment.
  */
 RTR3DECL(int) RTHttpSetHeaderCallback(RTHTTP hHttp, PFNRTHTTPHEADERCALLBACK pfnCallback, void *pvUser);

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

@@ -2859 +2859 @@
 
 
+/**
+ * Tries to determin uDownloadHttpStatus and cbDownloadContent.
+ *
+ * @param   pThis        HTTP client instance.
+ */
 static void rtHttpGetDownloadStatusAndLength(PRTHTTPINTERNAL pThis)
 {
@@ -2865 +2870 @@
     pThis->uDownloadHttpStatus = (uint32_t)lHttpStatus;
 
+#ifdef CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
     curl_off_t cbContent = -1;
     curl_easy_getinfo(pThis->pCurl, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &cbContent);
     if (cbContent >= 0)
         pThis->cbDownloadContent = (uint64_t)cbContent;
+#else
+    double rdContent = -1.0;
+    curl_easy_getinfo(pThis->pCurl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &rdContent);
+    if (rdContent >= 0.0)
+        pThis->cbDownloadContent = (uint64_t)rdContent;
+#endif
 }