This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new a03f292d9d Use default wpad.dat if autoproxy without explicit pacfile
location.
new 132886d05f Merge pull request #5210 from
sdedic/platform/windows-default-wpad
a03f292d9d is described below
commit a03f292d9d735da8b2b0d86a65f58a021e53ff73
Author: Svata Dedic <svatopluk.de...@oracle.com>
AuthorDate: Thu Jan 5 15:30:01 2023 +0100
Use default wpad.dat if autoproxy without explicit pacfile location.
---
.../netbeans/core/network/proxy/windows/WindowsNetworkProxy.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/platform/core.network/src/org/netbeans/core/network/proxy/windows/WindowsNetworkProxy.java
b/platform/core.network/src/org/netbeans/core/network/proxy/windows/WindowsNetworkProxy.java
index 24eb437cfa..c6138174bb 100644
---
a/platform/core.network/src/org/netbeans/core/network/proxy/windows/WindowsNetworkProxy.java
+++
b/platform/core.network/src/org/netbeans/core/network/proxy/windows/WindowsNetworkProxy.java
@@ -56,12 +56,12 @@ public class WindowsNetworkProxy implements
NetworkProxyResolver {
}
Pointer pacFilePointer = prxCnf.pacFile;
- if (pacFilePointer != null) {
- String pacFileUrl = pacFilePointer.getWideString(0);
+ if (pacFilePointer != null || prxCnf.autoDetect) {
+ String pacFileUrl = pacFilePointer != null ?
pacFilePointer.getWideString(0) : "http://wpad/wpad.dat";; // NOI18N
LOGGER.log(Level.INFO, "Windows system proxy resolver: auto -
PAC ({0})", pacFileUrl); //NOI18N
return new NetworkProxySettings(pacFileUrl);
- }
+ }
Pointer proxyPointer = prxCnf.proxy;
Pointer proxyBypassPointer = prxCnf.proxyBypass;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
