eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-12 10:00:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3260 from Akarshit/bugfix-proxy

Browse Source 
Added socks support in Processing
This commit is contained in:
Ben Fry
2015-05-10 12:05:14 -04:00
parent 0cc4d13c33 9551e0d56b
commit 76d6c4bc29
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/processing/app/Preferences.java
View File

@@ -154,6 +154,16 @@ public class Preferences {
System.setProperty("http.proxyHost", proxyHost);
System.setProperty("http.proxyPort", proxyPort);
}
// Set socks proxy for folks that require it.
// http://docs.oracle.com/javase/6/docs/technotes/guides/net/proxies.html
String socksProxyHost = get("socksProxy.host");
String socksProxyPort = get("socksProxy.port");
if (socksProxyHost != null && socksProxyHost.length() != 0 &&
socksProxyPort != null && socksProxyPort.length() != 0) {
System.setProperty("socksProxyHost", socksProxyHost);
System.setProperty("socksProxyPort", socksProxyPort);
}
}

8
build/shared/lib/defaults.txt
View File

@@ -327,6 +327,14 @@ run.present.stop.color = #cccccc
proxy.host=
proxy.port=
# SOCKS PROXY
# Set a proxy server for folks that require it. This will allow the update
# checker and the contrib manager to run properly in those environments.
#socksProxy.host=proxy.example.com
#socksProxy.port=9150
socksProxy.host=
socksProxy.port=
# PDE X
pdex.autoSave.autoSaveByDefault=true
pdex.autoSave.autoSaveEnabled=false