AfflictionNetworks/getdown
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass proxy info from Proxy object to launched app.

Browse Source
This commit is contained in:
Michael Bayne
2019-05-20 09:29:43 -07:00
parent a34394383b
commit daf459e063
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/threerings/getdown/data/Application.java
+7 -4
View File
@@ -7,6 +7,7 @@ package com.threerings.getdown.data;
import java.io.*; import java.io.*;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.net.InetSocketAddress;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.Proxy; import java.net.Proxy;
import java.net.URL; import java.net.URL;
@@ -961,12 +962,14 @@ public class Application
} }
// pass along our proxy settings // pass along our proxy settings
String proxyHost; if (proxy.type() == Proxy.Type.HTTP && proxy.address() instanceof InetSocketAddress) {
if ((proxyHost = System.getProperty("http.proxyHost")) != null) { InetSocketAddress proxyAddr = (InetSocketAddress) proxy.address();
String proxyHost = proxyAddr.getHostString();
int proxyPort = proxyAddr.getPort();
args.add("-Dhttp.proxyHost=" + proxyHost); 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.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 // add the marker indicating the app is running in getdown