Skip to content

Commit

Permalink
Use proxy configuration also for HTTPS connections - fixes #2249 (#2418)
Browse files Browse the repository at this point in the history
* use proxy configuration also for HTTPS connections - fixes #2249

* Add CHANGELOG for #2249 fix

* Fix brackets
  • Loading branch information
matthiasgeiger authored and lenhard committed Dec 22, 2016
1 parent 599e21d commit a9153d6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
- We fixed issues with the [timestamp](http://help.jabref.org/en/TimeStamp) field. However, clearing with the clear button is not possible if timestamp format does not match the current settings. Fixes [#2403](https://github.com/JabRef/jabref/issues/2403).
- Fixes [#2406](https://github.com/JabRef/jabref/issues/2406) so that the integrity check filter works again
- Closing of subtrees in the groups panel using "close subtree" is working again. Fixes [#2319](https://github.com/JabRef/jabref/issues/2319).
- The proxy settings are now also applied to HTTPS connections. Fixes [#2249](https://github.com/JabRef/jabref/issues/2249).



### Removed

Expand Down
6 changes: 6 additions & 0 deletions src/main/java/net/sf/jabref/logic/net/ProxyRegisterer.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@ public static void register(ProxyPreferences proxyPrefs) {
System.setProperty("http.proxyHost", proxyPrefs.getHostname());
System.setProperty("http.proxyPort", proxyPrefs.getPort());

System.setProperty("https.proxyHost", proxyPrefs.getHostname());
System.setProperty("https.proxyPort", proxyPrefs.getPort());

// NetworkTab.java ensures that proxyUsername and proxyPassword are neither null nor empty
if (proxyPrefs.isUseAuthentication()) {
System.setProperty("http.proxyUser", proxyPrefs.getUsername());
System.setProperty("http.proxyPassword", proxyPrefs.getPassword());

System.setProperty("https.proxyUser", proxyPrefs.getUsername());
System.setProperty("https.proxyPassword", proxyPrefs.getPassword());
}
} else {
// The following two lines signal that the system proxy settings
Expand Down

0 comments on commit a9153d6

Please sign in to comment.