Changeset 51704 in vbox for trunk/src/VBox/Runtime/common/misc/http.cpp

Timestamp:

Jun 24, 2014 11:06:52 AM (10 years ago)

Author:

vboxsync

Message:

Runtime/http: added handling for 301 responses

File:

• trunk/src/VBox/Runtime/common/misc/http.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/misc/http.cpp

@@ -50 +50 @@
 typedef struct RTHTTPINTERNAL
 {
-    /** magic value */
-    uint32_t u32Magic;
-    /** cURL handle */
-    CURL *pCurl;
-    long lLastResp;
+    /** Magic value. */
+    uint32_t            u32Magic;
+    /** cURL handle. */
+    CURL                *pCurl;
+    /** The last response code. */
+    long                lLastResp;
     /** custom headers */
-    struct curl_slist *pHeaders;
-    /** CA certificate for HTTPS authentication check */
-    char *pcszCAFile;
-    /** abort the current HTTP request if true */
-    bool fAbort;
+    struct curl_slist   *pHeaders;
+    /** CA certificate for HTTPS authentication check. */
+    char                *pcszCAFile;
+    /** Abort the current HTTP request if true. */
+    bool                fAbort;
+    /** The location field for 301 responses. */
+    char                *pszRedirLocation;
 } RTHTTPINTERNAL;
 typedef RTHTTPINTERNAL *PRTHTTPINTERNAL;
@@ -136 +139 @@
         RTStrFree(pHttpInt->pcszCAFile);
 
+    if (pHttpInt->pszRedirLocation)
+        RTStrFree(pHttpInt->pszRedirLocation);
+
     RTMemFree(pHttpInt);
 
@@ -172 +178 @@
     pHttpInt->fAbort = true;
 
+    return VINF_SUCCESS;
+}
+
+RTR3DECL(int) RTHttpGetRedirLocation(RTHTTP hHttp, char **ppszRedirLocation)
+{
+    PRTHTTPINTERNAL pHttpInt = hHttp;
+    RTHTTP_VALID_RETURN(pHttpInt);
+
+    if (!pHttpInt->pszRedirLocation)
+        return VERR_HTTP_NOT_FOUND;
+
+    *ppszRedirLocation = RTStrDup(pHttpInt->pszRedirLocation);
     return VINF_SUCCESS;
 }
@@ -354 +372 @@
 {
     int rc = VERR_INTERNAL_ERROR;
+
+    if (pHttpInt->pszRedirLocation)
+    {
+        RTStrFree(pHttpInt->pszRedirLocation);
+        pHttpInt->pszRedirLocation = NULL;
+    }
     if (rcCurl == CURLE_OK)
     {
@@ -365 +389 @@
                 rc = VINF_SUCCESS;
                 break;
+            case 301:
+            {
+                const char *pszRedirect;
+                curl_easy_getinfo(pHttpInt->pCurl, CURLINFO_REDIRECT_URL, &pszRedirect);
+                size_t cb = strlen(pszRedirect);
+                if (cb > 0 && cb < 4096)
+                    pHttpInt->pszRedirLocation = RTStrDup(pszRedirect);
+                rc = VERR_HTTP_REDIRECTED;
+                break;
+            }
             case 400:
                 /* bad request */