stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8262442: (windows) Use all proxy configuration sources when java.net.useSystemProxies=true

Browse Source 
Reviewed-by: dfuchs
This commit is contained in:
Daniel Jelinski 2022-01-13 14:41:55 +00:00 committed by Daniel Fuchs
parent c17a0122c4
commit 6fcaa322d9
1 changed files with 10 additions and 8 deletions

18
src/java.base/windows/native/libnet/DefaultProxySelector.c

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -230,16 +230,12 @@ Java_sun_net_spi_DefaultProxySelector_getSystemProxies(JNIEnv *env,
auto_proxy_options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT;
auto_proxy_options.fAutoLogonIfChallenged = TRUE;
use_auto_proxy = TRUE;
} else if (ie_proxy_config.lpszAutoConfigUrl != NULL) {
}
if (ie_proxy_config.lpszAutoConfigUrl != NULL) {
/* Windows uses PAC file */
auto_proxy_options.lpszAutoConfigUrl = ie_proxy_config.lpszAutoConfigUrl;
auto_proxy_options.dwFlags = WINHTTP_AUTOPROXY_CONFIG_URL;
auto_proxy_options.dwFlags |= WINHTTP_AUTOPROXY_CONFIG_URL;
use_auto_proxy = TRUE;
} else if (ie_proxy_config.lpszProxy != NULL) {
/* Windows uses manually entered proxy. */
use_auto_proxy = FALSE;
win_bypass_proxy = ie_proxy_config.lpszProxyBypass;
win_proxy = ie_proxy_config.lpszProxy;
}
if (use_auto_proxy) {
@ -254,6 +250,12 @@ Java_sun_net_spi_DefaultProxySelector_getSystemProxies(JNIEnv *env,
}
}
if (!use_auto_proxy && ie_proxy_config.lpszProxy != NULL) {
/* Windows uses manually entered proxy. */
win_bypass_proxy = ie_proxy_config.lpszProxyBypass;
win_proxy = ie_proxy_config.lpszProxy;
}
/* Check the bypass entry. */
if (NULL != win_bypass_proxy) {
/*