Mercurial > hg > release > icedtea-web-1.6
changeset 283:7afd916031fa
RH734081: Javaws cannot use proxy settings from Firefox
Based on patch from Lukas Zachar <lzachar at redhat dot com>
2011-08-29 Deepak Bhole <dbhole@redhat.com>
* netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java
(find): Only process Profile sections. Do not throw an exception if a
Default= line is not found since it is not guaranteed to exist.
author | Deepak Bhole <dbhole@redhat.com> |
---|---|
date | Mon, 29 Aug 2011 17:02:36 -0400 |
parents | 36270c76a533 |
children | 68a6e5d41dfc |
files | ChangeLog NEWS netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java |
diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Aug 24 15:17:46 2011 -0400 +++ b/ChangeLog Mon Aug 29 17:02:36 2011 -0400 @@ -1,3 +1,11 @@ +2011-08-29 Deepak Bhole <dbhole@redhat.com> + + RH734081: Javaws cannot use proxy settings from Firefox + Based on patch from Lukas Zachar <lzachar at redhat dot com> + * netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java + (find): Only process Profile sections. Do not throw an exception if a + Default= line is not found since it is not guaranteed to exist. + 2011-08-24 Deepak Bhole <dbhole@redhat.com> RH718693: MindTerm SSH Applet doesn't work
--- a/NEWS Wed Aug 24 15:17:46 2011 -0400 +++ b/NEWS Mon Aug 29 17:02:36 2011 -0400 @@ -22,6 +22,7 @@ - PR771: IcedTea-Web certificate verification code does not use the right API - PR742: IcedTea-Web checks certs only upto 1 level deep before declaring them untrusted. - PR769: IcedTea-Web does not work with some ssl sites with OpenJDK7 + - RH734081: Javaws cannot use proxy settings from Firefox New in release 1.1 (2011-XX-XX): * Security updates
--- a/netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java Wed Aug 24 15:17:46 2011 -0400 +++ b/netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java Mon Aug 29 17:02:36 2011 -0400 @@ -93,7 +93,7 @@ } line = line.trim(); - if (line.startsWith("[") && line.endsWith("]")) { + if (line.startsWith("[Profile") && line.endsWith("]")) { if (foundDefaultSection) { break; } @@ -115,7 +115,7 @@ reader.close(); } - if (!foundDefaultSection) { + if (!foundDefaultSection && linesInSection.size() == 0) { throw new FileNotFoundException("preferences file"); }