Changeset 73334 in vbox for trunk/src/VBox/Runtime/generic/http-curl.cpp

Timestamp:

Jul 23, 2018 4:52:04 PM (6 years ago)

Author:

vboxsync

Message:

IPRT: Added RTHttpSetFollowRedirects (translates to CURLOPT_FOLLOWLOCATION+CURLOPT_MAXREDIRS) and make use of it RTDbgCfg and RTHttp[.exe]. This should fix the current pdb download issues as we're getting 302 redirects from the servers. Also, changed RTHttp to return VERR_HTTP_REDIRECTED when receiving 302, 303, 307 & 308 HTTP statuses.

File:

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

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

@@ -126 +126 @@
     /** @} */
 
+    /** @name Cached settings.
+     * @{ */
+    /** Maximum number of redirects to follow.
+     * Zero if not automatically following (default). */
+    uint32_t            cMaxRedirects;
+    /** @} */
+
     /** Abort the current HTTP request if true. */
     bool volatile       fAbort;
@@ -273 +280 @@
                 pThis->pCurl                    = pCurl;
                 pThis->fUseSystemProxySettings  = true;
+                pThis->cMaxRedirects            = 0; /* no automatic redir following */
 
                 *phHttp = (RTHTTP)pThis;
@@ -1825 +1833 @@
 
 
+RTR3DECL(int) RTHttpSetFollowRedirects(RTHTTP hHttp, uint32_t cMaxRedirects)
+{
+    PRTHTTPINTERNAL pThis = hHttp;
+    RTHTTP_VALID_RETURN(pThis);
+    AssertReturn(!pThis->fBusy, VERR_WRONG_ORDER);
+
+    /*
+     * Update the redirection settings.
+     */
+    if (pThis->cMaxRedirects != cMaxRedirects)
+    {
+        int rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_MAXREDIRS, (long)cMaxRedirects);
+        AssertMsgReturn(rcCurl == CURLE_OK, ("CURLOPT_MAXREDIRS=%u: %d (%#x)\n", cMaxRedirects, rcCurl, rcCurl),
+                        VERR_HTTP_CURL_ERROR);
+
+        rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_FOLLOWLOCATION, (long)(cMaxRedirects > 0));
+        AssertMsgReturn(rcCurl == CURLE_OK, ("CURLOPT_FOLLOWLOCATION=%d: %d (%#x)\n", cMaxRedirects > 0, rcCurl, rcCurl),
+                        VERR_HTTP_CURL_ERROR);
+
+        pThis->cMaxRedirects = cMaxRedirects;
+    }
+    return VINF_SUCCESS;
+}
+
+
 RTR3DECL(int) RTHttpSetHeaders(RTHTTP hHttp, size_t cHeaders, const char * const *papszHeaders)
 {
@@ -2049 +2082 @@
                 rc = VINF_SUCCESS;
                 break;
-            case 301:
+            case 301: /* Moved permantently. */
+            case 302: /* Found / Moved temporarily. */
+            case 303: /* See Other. */
+            case 307: /* Temporary redirect. */
+            case 308: /* Permanent redirect. */
             {
-                const char *pszRedirect;
+                const char *pszRedirect = NULL;
                 curl_easy_getinfo(pThis->pCurl, CURLINFO_REDIRECT_URL, &pszRedirect);
-                size_t cb = strlen(pszRedirect);
+                size_t cb = pszRedirect ? strlen(pszRedirect) : 0;
                 if (cb > 0 && cb < 2048)
                     pThis->pszRedirLocation = RTStrDup(pszRedirect);