From 380a50d8ca969a8820e77b4ec7e84f8038a193f1 Mon Sep 17 00:00:00 2001 From: Akarshit Wal Date: Sun, 10 May 2015 01:38:09 +0530 Subject: [PATCH 1/4] Socks Proxy now supported if put in preference.txt --- app/src/processing/app/Preferences.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java index 13aac3280..d722d6a09 100644 --- a/app/src/processing/app/Preferences.java +++ b/app/src/processing/app/Preferences.java @@ -154,6 +154,13 @@ public class Preferences { System.setProperty("http.proxyHost", proxyHost); System.setProperty("http.proxyPort", proxyPort); } + 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); + } } From 765afa5024a46fd2e501ad298f799b4484b66f90 Mon Sep 17 00:00:00 2001 From: Akarshit Wal Date: Sun, 10 May 2015 01:46:43 +0530 Subject: [PATCH 2/4] Added socks support in the defaults file so that it is available in preference.txt --- build/shared/lib/defaults.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build/shared/lib/defaults.txt b/build/shared/lib/defaults.txt index f52b4261d..5c58c69c7 100644 --- a/build/shared/lib/defaults.txt +++ b/build/shared/lib/defaults.txt @@ -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 From 06afa9eee5dd0a6584d56b2ad020d84a80d48a05 Mon Sep 17 00:00:00 2001 From: Akarshit Wal Date: Sun, 10 May 2015 01:48:01 +0530 Subject: [PATCH 3/4] Added documentation --- app/src/processing/app/Preferences.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java index d722d6a09..54f19b873 100644 --- a/app/src/processing/app/Preferences.java +++ b/app/src/processing/app/Preferences.java @@ -154,6 +154,9 @@ 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 From 9551e0d56bcd42089e92d943e011483d8f514e69 Mon Sep 17 00:00:00 2001 From: Akarshit Wal Date: Sun, 10 May 2015 01:48:53 +0530 Subject: [PATCH 4/4] Corrected identation --- app/src/processing/app/Preferences.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java index 54f19b873..87af338eb 100644 --- a/app/src/processing/app/Preferences.java +++ b/app/src/processing/app/Preferences.java @@ -154,13 +154,13 @@ 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) { + if (socksProxyHost != null && socksProxyHost.length() != 0 && + socksProxyPort != null && socksProxyPort.length() != 0) { System.setProperty("socksProxyHost", socksProxyHost); System.setProperty("socksProxyPort", socksProxyPort); }