diff --git a/CHANGELOG.md b/CHANGELOG.md index 27a4556..ddab478 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Change Log This file contains the change log. +## 1.1.6 +* Fixed issue #147: Unexpected proxy auto-detection result on Windows. +* Update dependencies + ## 1.1.5 * Fixed issue #109: PListParser#base64decode does not expect data to be multiline. Thanks to vsalavatov! * Update dependencies diff --git a/src/main/java/com/github/markusbernhardt/proxy/search/browser/ie/IEProxySearchStrategy.java b/src/main/java/com/github/markusbernhardt/proxy/search/browser/ie/IEProxySearchStrategy.java index c57c26e..7298ef8 100644 --- a/src/main/java/com/github/markusbernhardt/proxy/search/browser/ie/IEProxySearchStrategy.java +++ b/src/main/java/com/github/markusbernhardt/proxy/search/browser/ie/IEProxySearchStrategy.java @@ -107,8 +107,9 @@ private PacProxySelector createPacSelector(IEProxyConfig ieProxyConfig) { WINHTTP_AUTO_DETECT_TYPE_DHCP | WINHTTP_AUTO_DETECT_TYPE_DNS_A); pacUrl = WinHttpHelpers.detectAutoProxyConfigUrl(dwAutoDetectFlags); } - if (pacUrl == null) { + if (pacUrl == null || pacUrl.trim().length() == 0) { pacUrl = ieProxyConfig.getAutoConfigUrl(); + Logger.log(getClass(), LogLevel.TRACE, "Autodetecting script URL did not return valid pacUrl. Use autoConfigUrl from IE proxy config: " + pacUrl); } if (pacUrl != null && pacUrl.trim().length() > 0) { Logger.log(getClass(), LogLevel.TRACE, "IE uses script: " + pacUrl); @@ -121,6 +122,9 @@ private PacProxySelector createPacSelector(IEProxyConfig ieProxyConfig) { } return ProxyUtil.buildPacSelectorForUrl(pacUrl); } + else { + Logger.log(getClass(), LogLevel.TRACE, "The pacUrl for IE is not available: " + pacUrl); + } return null; }