From 28cad72291c7e5ecd7cb079a4fa1b0ee9ec6f43d Mon Sep 17 00:00:00 2001 From: Stefan Endrullis Date: Wed, 16 Dec 2015 13:27:55 +0100 Subject: [PATCH] added support for https proxies --- src/main/java/com/threerings/getdown/data/Application.java | 2 ++ src/main/java/com/threerings/getdown/launcher/Getdown.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/threerings/getdown/data/Application.java b/src/main/java/com/threerings/getdown/data/Application.java index f84c68f..3d864a1 100644 --- a/src/main/java/com/threerings/getdown/data/Application.java +++ b/src/main/java/com/threerings/getdown/data/Application.java @@ -918,6 +918,8 @@ public class Application if ((proxyHost = System.getProperty("http.proxyHost")) != null) { args.add("-Dhttp.proxyHost=" + proxyHost); args.add("-Dhttp.proxyPort=" + System.getProperty("http.proxyPort")); + args.add("-Dhttps.proxyHost=" + proxyHost); + args.add("-Dhttps.proxyPort=" + System.getProperty("http.proxyPort")); } // add the marker indicating the app is running in getdown diff --git a/src/main/java/com/threerings/getdown/launcher/Getdown.java b/src/main/java/com/threerings/getdown/launcher/Getdown.java index 77c60b6..4cfa14e 100644 --- a/src/main/java/com/threerings/getdown/launcher/Getdown.java +++ b/src/main/java/com/threerings/getdown/launcher/Getdown.java @@ -344,8 +344,10 @@ public abstract class Getdown extends Thread { if (!StringUtil.isBlank(host)) { System.setProperty("http.proxyHost", host); + System.setProperty("https.proxyHost", host); if (!StringUtil.isBlank(port)) { System.setProperty("http.proxyPort", port); + System.setProperty("https.proxyPort", port); } log.info("Using proxy", "host", host, "port", port); }