Changeset 68968 in vbox

Timestamp:

Oct 4, 2017 7:59:44 AM (7 years ago)

Author:

vboxsync

Message:

http-curl.cpp: Ignore ERROR_WINHTTP_UNRECOGNIZED_SCHEME error code from WinHttpGetProxyForUrl if we've got a valid http[s] URL scheme in what we pass it, because the error then is documented to mean there is something bogus with the PAC server URL.

File:

• trunk/src/VBox/Runtime/generic/http-curl.cpp (modified) (1 diff)

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

@@ -1713 +1713 @@
                     {
                         DWORD dwErr = GetLastError();
-                        if (dwErr == ERROR_WINHTTP_AUTODETECTION_FAILED)
+                        if (   dwErr == ERROR_WINHTTP_AUTODETECTION_FAILED
+                            || (   dwErr == ERROR_WINHTTP_UNRECOGNIZED_SCHEME
+                                && (   RTStrNICmp(pszUrl, RT_STR_TUPLE("https://")) == 0
+                                    || RTStrNICmp(pszUrl, RT_STR_TUPLE("http://")) == 0) ) )
                             rcRet = rtHttpUpdateAutomaticProxyDisable(pThis);
                         else
-                            AssertMsgFailed(("g_pfnWinHttpGetProxyForUrl -> %u\n", dwErr));
+                            AssertMsgFailed(("g_pfnWinHttpGetProxyForUrl(%s) -> %u\n", pszUrl, dwErr));
                     }
                     RTUtf16Free(pwszUrl);