/hg/icedtea-web: Fix PR1299: WebStart doesn't read socket proxy ...

[adomurad at icedtea.classpath.org]

changeset 50295be3e2da in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=50295be3e2da
author: Adam Domurad <adomurad at redhat.com>
date: Tue Apr 23 10:18:52 2013 -0400

	Fix PR1299: WebStart doesn't read socket proxy settings from firefox correctly


diffstat:

 ChangeLog                                                        |  7 +++++++
 NEWS                                                             |  1 +
 netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java |  2 +-
 3 files changed, 9 insertions(+), 1 deletions(-)

diffs (37 lines):

diff -r 0f85f68370a4 -r 50295be3e2da ChangeLog
--- a/ChangeLog	Fri Apr 19 16:41:33 2013 +0200
+++ b/ChangeLog	Tue Apr 23 10:18:52 2013 -0400
@@ -1,3 +1,10 @@
+2013-04-23  Omair Majid  <omajid at redhat.com>
+
+	PR1299
+	* NEWS: Update with fix
+	* netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java
+	(initFromBrowserConfig): Fix typo in socks proxy setting key.
+
 2013-04-19  Jiri Vanek <jvanek at redhat.com>
 
 	testing server allowed from makefile
diff -r 0f85f68370a4 -r 50295be3e2da NEWS
--- a/NEWS	Fri Apr 19 16:41:33 2013 +0200
+++ b/NEWS	Tue Apr 23 10:18:52 2013 -0400
@@ -43,6 +43,7 @@
   - PR822: Applets fail to load if jars have different signers
   - PR1186: System.getProperty("deployment.user.security.trusted.cacerts") is null
   - PR909: The Java applet at http://de.gosupermodel.com/games/wardrobegame.jsp fails
+  - PR1299: WebStart doesn't read socket proxy settings from firefox correctly
 
 New in release 1.3 (2012-XX-XX):
 * NetX
diff -r 0f85f68370a4 -r 50295be3e2da netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java
--- a/netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java	Fri Apr 19 16:41:33 2013 +0200
+++ b/netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java	Tue Apr 23 10:18:52 2013 -0400
@@ -146,7 +146,7 @@
         browserHttpsProxyPort = stringToPort(prefs.get("network.proxy.ssl_port"));
         browserFtpProxyHost = prefs.get("network.proxy.ftp");
         browserFtpProxyPort = stringToPort(prefs.get("network.proxy.ftp_port"));
-        browserSocks4ProxyHost = prefs.get("networking.proxy.socks");
+        browserSocks4ProxyHost = prefs.get("network.proxy.socks");
         browserSocks4ProxyPort = stringToPort(prefs.get("network.proxy.socks_port"));
     }