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

Timestamp:

Sep 20, 2018 12:37:23 AM (6 years ago)

Author:

vboxsync

Message:

IPRT/http: Added RTHttpSetProxyByUrl, deprecating RTHttpSetProxy in favor of it. bugref:9248

File:

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

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

@@ -575 +575 @@
         AssertMsgReturn(rcCurl == CURLE_OK, ("CURLOPT_PROXYTYPE=%d: %d (%#x)\n", enmProxyType, rcCurl, rcCurl),
                         VERR_HTTP_CURL_PROXY_CONFIG);
-        pThis->enmProxyType = CURLPROXY_HTTP;
+        pThis->enmProxyType = enmProxyType;
     }
 
@@ -829 +829 @@
             char    *pszPassword = RTUriParsedAuthorityPassword(pszProxyUrl, &Parsed);
             uint32_t uProxyPort  = RTUriParsedAuthorityPort(pszProxyUrl, &Parsed);
+            bool     fUnknownProxyType = false;
             curl_proxytype enmProxyType;
             if (RTUriIsSchemeMatch(pszProxyUrl, "http"))
@@ -836 +837 @@
                     uProxyPort = 80;
             }
+#if CURL_AT_LEAST_VERSION(7,52,0)
+            else if (RTUriIsSchemeMatch(pszProxyUrl, "https"))
+            {
+                enmProxyType  = CURLPROXY_HTTPS;
+                if (uProxyPort == UINT32_MAX)
+                    uProxyPort = 443;
+            }
+#endif
             else if (   RTUriIsSchemeMatch(pszProxyUrl, "socks4")
                      || RTUriIsSchemeMatch(pszProxyUrl, "socks"))
@@ -847 +856 @@
             else
             {
+                fUnknownProxyType = true;
                 enmProxyType = CURLPROXY_HTTP;
                 if (uProxyPort == UINT32_MAX)
@@ -857 +867 @@
 
             rc = rtHttpUpdateProxyConfig(pThis, enmProxyType, pszHost, uProxyPort, pszUsername, pszPassword);
+            if (RT_SUCCESS(rc) && fUnknownProxyType)
+                rc = VWRN_WRONG_TYPE;
 
             RTStrFree(pszUsername);
@@ -871 +883 @@
         RTMemTmpFree(pszFreeMe);
     return rc;
+}
+
+
+RTR3DECL(int) RTHttpSetProxyByUrl(RTHTTP hHttp, const char *pszUrl)
+{
+    PRTHTTPINTERNAL pThis = hHttp;
+    RTHTTP_VALID_RETURN(pThis);
+    AssertPtrNullReturn(pszUrl, VERR_INVALID_PARAMETER);
+    AssertReturn(!pThis->fBusy, VERR_WRONG_ORDER);
+
+    if (!pszUrl || !*pszUrl)
+        return RTHttpUseSystemProxySettings(pThis);
+    if (RTStrNICmpAscii(pszUrl, RT_STR_TUPLE("direct://")) == 0)
+        return rtHttpUpdateAutomaticProxyDisable(pThis);
+    return rtHttpConfigureProxyFromUrl(pThis, pszUrl);
 }