From daf459e06344b281e2000fb84eafce74a9c246e8 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Mon, 20 May 2019 09:29:43 -0700 Subject: [PATCH] Pass proxy info from Proxy object to launched app. --- .../java/com/threerings/getdown/data/Application.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/threerings/getdown/data/Application.java b/core/src/main/java/com/threerings/getdown/data/Application.java index a5a5f9f..1412d8a 100644 --- a/core/src/main/java/com/threerings/getdown/data/Application.java +++ b/core/src/main/java/com/threerings/getdown/data/Application.java @@ -7,6 +7,7 @@ package com.threerings.getdown.data; import java.io.*; import java.lang.reflect.Method; +import java.net.InetSocketAddress; import java.net.MalformedURLException; import java.net.Proxy; import java.net.URL; @@ -961,12 +962,14 @@ public class Application } // pass along our proxy settings - String proxyHost; - if ((proxyHost = System.getProperty("http.proxyHost")) != null) { + if (proxy.type() == Proxy.Type.HTTP && proxy.address() instanceof InetSocketAddress) { + InetSocketAddress proxyAddr = (InetSocketAddress) proxy.address(); + String proxyHost = proxyAddr.getHostString(); + int proxyPort = proxyAddr.getPort(); args.add("-Dhttp.proxyHost=" + proxyHost); - args.add("-Dhttp.proxyPort=" + System.getProperty("http.proxyPort")); + args.add("-Dhttp.proxyPort=" + proxyPort); args.add("-Dhttps.proxyHost=" + proxyHost); - args.add("-Dhttps.proxyPort=" + System.getProperty("http.proxyPort")); + args.add("-Dhttps.proxyPort=" + proxyPort); } // add the marker indicating the app is running in getdown