From dc768515d592bdbac2da509902ddd6916daa13b6 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Fri, 4 Jan 2019 10:52:42 -0800 Subject: [PATCH] Add changelog entry, wrap long line. --- CHANGELOG.md | 3 +++ .../src/main/java/com/threerings/getdown/launcher/Getdown.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71286ab..c82c87a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,9 @@ * Number of concurrent downloads now defaults to num-cores minus one. Though downloads are I/O bound rather than CPU bound, this still turns out to be a decent default. +* Avoid checking for proxy config if `https.proxyHost` is set. This matches existing behavior when + `http.proxyHost` is set. + ## 1.8.2 - Nov 27, 2018 * Fixed a data corruption bug introduced at last minute into 1.8.1 release. Oops. diff --git a/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java b/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java index 55e5222..20ad0b0 100644 --- a/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java +++ b/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java @@ -223,7 +223,8 @@ public abstract class Getdown extends Thread protected boolean detectProxy () { // we may already have a proxy configured - if (System.getProperty("http.proxyHost") != null || System.getProperty("https.proxyHost") != null) { + if (System.getProperty("http.proxyHost") != null || + System.getProperty("https.proxyHost") != null) { return true; }