virtualbox-7.2.4

2025-10-24 10:16:11 +03:00
parent 10936ad141
commit 432eda276e
2 changed files with 41 additions and 1 deletions
@@ -0,0 +1,40 @@
+diff --git a/src/VBox/Runtime/generic/http-curl.cpp b/src/VBox/Runtime/generic/http-curl.cpp
+index 4cf51049..585bfb18 100644
+--- a/src/VBox/Runtime/generic/http-curl.cpp
+++ b/src/VBox/Runtime/generic/http-curl.cpp
+@@ -188,7 +188,7 @@ typedef struct RTHTTPINTERNAL
+     /** Proxy port number (UINT32_MAX if not specified). */
+     uint32_t            uProxyPort;
+     /** The proxy type (CURLPROXY_HTTP, CURLPROXY_SOCKS5, ++). */
+-    curl_proxytype      enmProxyType;
+    long                enmProxyType;
+     /** Proxy username (RTStrFree). */
+     char               *pszProxyUsername;
+     /** Proxy password (RTStrFree). */
+@@ -591,7 +591,7 @@ RTR3DECL(int) RTHttpUseSystemProxySettings(RTHTTP hHttp)
+  * @param   pszUsername     The proxy username, or NULL if none.
+  * @param   pszPassword     The proxy password, or NULL if none.
+  */
+-static int rtHttpUpdateProxyConfig(PRTHTTPINTERNAL pThis, curl_proxytype enmProxyType, const char *pszHost,
+static int rtHttpUpdateProxyConfig(PRTHTTPINTERNAL pThis, long enmProxyType, const char *pszHost,
+                                    uint32_t uPort, const char *pszUsername, const char *pszPassword)
+ {
+     CURLcode rcCurl;
+@@ -871,7 +871,7 @@ static int rtHttpConfigureProxyFromUrl(PRTHTTPINTERNAL pThis, const char *pszPro
+             char    *pszPassword = RTUriParsedAuthorityPassword(pszProxyUrl, &Parsed);
+             uint32_t uProxyPort  = RTUriParsedAuthorityPort(pszProxyUrl, &Parsed);
+             bool     fUnknownProxyType = false;
+-            curl_proxytype enmProxyType;
+            long     enmProxyType;
+             if (RTUriIsSchemeMatch(pszProxyUrl, "http"))
+             {
+                 enmProxyType  = CURLPROXY_HTTP;
+@@ -1352,7 +1352,7 @@ static int rtHttpDarwinTryConfigProxy(PRTHTTPINTERNAL pThis, CFDictionaryRef hDi
+      * Determine the proxy type (not entirely sure about type == proxy type and
+      * not scheme/protocol)...
+      */
+-    curl_proxytype  enmProxyType      = CURLPROXY_HTTP;
+    long            enmProxyType      = CURLPROXY_HTTP;
+     uint32_t        uDefaultProxyPort = 8080;
+     if (   CFEqual(hStrProxyType, kCFProxyTypeHTTP)
+         || CFEqual(hStrProxyType, kCFProxyTypeHTTPS))