Skip to content

Commit 464f791

Browse files
Perform clean code of team/bundles/org.eclipse.core.net
1 parent 15b942c commit 464f791

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

team/bundles/org.eclipse.core.net/src/org/eclipse/core/net/internal/proxy/win32/ProxyProviderWin32.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -119,20 +119,15 @@ protected IProxyData[] getSystemProxyInfo(URI uri) {
119119
if (Policy.DEBUG_SYSTEM_PROVIDERS) {
120120
Policy.debug("Dynamic proxy configuration using WPAD"); //$NON-NLS-1$
121121
}
122-
autoProxyOptions.dwFlags = WinHttp.AUTOPROXY_AUTO_DETECT;
123-
autoProxyOptions.dwAutoDetectFlags = WinHttp.AUTO_DETECT_TYPE_DHCP | WinHttp.AUTO_DETECT_TYPE_DNS_A;
124122
}
125123
// PAC: Proxy-Auto Configuration
126124
// When both WPAD and PAC are set, WinHTTP tries PAC only after WPAD failed
127125
if (proxyConfig.lpszAutoConfigUrl != null) {
128126
if (Policy.DEBUG_SYSTEM_PROVIDERS) {
129127
Policy.debug("Dynamic proxy configuration using PAC url"); //$NON-NLS-1$
130128
}
131-
autoProxyOptions.dwFlags |= WinHttp.AUTOPROXY_CONFIG_URL;
132129
autoProxyOptions.lpszAutoConfigUrl = proxyConfig.getAutoConfigUrl();
133130
}
134-
autoProxyOptions.fAutoLogonIfChallenged = true;
135-
136131
try {
137132
getProxyForUrl(hHttpSession, uri.toString(), autoProxyOptions, proxyInfo);
138133
if (Policy.DEBUG_SYSTEM_PROVIDERS) {
@@ -302,7 +297,6 @@ private static boolean getProxyForUrl(Pointer hSession, String lpcwszUrl,
302297
return fWinHttp.WinHttpGetProxyForUrl(hSession, lpcwszUrl, pAutoProxyOptions, pProxyInfo);
303298
} catch (LastErrorException e) {
304299
if (e.getErrorCode() == WinHttp.ERROR_LOGIN_FAILURE) {
305-
pAutoProxyOptions.fAutoLogonIfChallenged = true;
306300
return fWinHttp.WinHttpGetProxyForUrl(hSession, lpcwszUrl, pAutoProxyOptions, pProxyInfo);
307301
}
308302
throw e;
@@ -349,18 +343,11 @@ boolean WinHttpGetProxyForUrl(Pointer hSession, String lpcwszUrl, WinHttpAutoPro
349343
"fAutoLogonIfChallenged" })
350344
@SuppressWarnings("unused")
351345
static class WinHttpAutoProxyOptions extends Structure {
352-
public int dwFlags;
353-
public int dwAutoDetectFlags;
354346
public String lpszAutoConfigUrl;
355-
public Pointer lpvReserved;
356-
public int dwReserved;
357-
public boolean fAutoLogonIfChallenged;
358347
}
359348

360349
@FieldOrder({ "dwAccessType", "lpszProxy", "lpszProxyBypass" })
361-
@SuppressWarnings("unused")
362350
static class WinHttpProxyInfo extends Structure {
363-
public int dwAccessType;
364351
public LPWSTR lpszProxy;
365352
public LPWSTR lpszProxyBypass;
366353

0 commit comments

Comments
 (0)