Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#147: Try to fix proxy not found if autoDetect is enabled but detectAutoProxyConfigUrl returns empty string #148

Merged
merged 2 commits into from
Nov 25, 2024
Merged

#147: Try to fix proxy not found if autoDetect is enabled but detectAutoProxyConfigUrl returns empty string #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b036e0c
#147: Try to fix proxy not found if autoDetect is enabled but detectA…
akuhtz Nov 12, 2024
1249a9b
#147: Update changelog
akuhtz Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/github/markusbernhardt/proxy/search/browser/ie/IEProxySearchStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
}
Expand Down