Changeset 79840 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jul 17, 2019 4:09:05 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

132227

Message:

IPRT/http-curl.cpp: Apparently cURL forgets proxy setup after curl_easy_reset(), so added flag to force updating it.

File:

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

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

@@ -171 +171 @@
     /** Set if we've detected no proxy necessary. */
     bool                fNoProxy;
+    /** Set if we've reset proxy info in cURL and need to reapply it.  */
+    bool                fReapplyProxyInfo;
     /** Proxy host name (RTStrFree). */
     char               *pszProxyHost;
@@ -433 +435 @@
     pThis->rcOutput                 = VINF_SUCCESS;
 
+    /* Tell the proxy configuration code to reapply settings even if they
+       didn't change as cURL has forgotten them: */
+    pThis->fReapplyProxyInfo        = true;
+
     return VINF_SUCCESS;
 }
@@ -586 +592 @@
 #endif
 
-    if (enmProxyType != pThis->enmProxyType)
+    if (   pThis->fReapplyProxyInfo
+        || enmProxyType != pThis->enmProxyType)
     {
         rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_PROXYTYPE, (long)enmProxyType);
@@ -594 +601 @@
     }
 
-    if (uPort != pThis->uProxyPort)
+    if (   pThis->fReapplyProxyInfo
+        || uPort != pThis->uProxyPort)
     {
         rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_PROXYPORT, (long)uPort);
@@ -602 +610 @@
     }
 
-    if (   pszUsername != pThis->pszProxyUsername
+    if (   pThis->fReapplyProxyInfo
+        || pszUsername != pThis->pszProxyUsername
         || RTStrCmp(pszUsername, pThis->pszProxyUsername))
     {
@@ -620 +629 @@
     }
 
-    if (   pszPassword != pThis->pszProxyPassword
+    if (   pThis->fReapplyProxyInfo
+        || pszPassword != pThis->pszProxyPassword
         || RTStrCmp(pszPassword, pThis->pszProxyPassword))
     {
@@ -639 +649 @@
     }
 
-    if (   pszHost != pThis->pszProxyHost
+    if (   pThis->fReapplyProxyInfo
+        || pszHost != pThis->pszProxyHost
         || RTStrCmp(pszHost, pThis->pszProxyHost))
     {
@@ -657 +668 @@
     }
 
+    pThis->fReapplyProxyInfo = false;
     return VINF_SUCCESS;
 }