Mercurial > hg > release > icedtea-web-1.7

changeset 1504:fa507388eea5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
https is preffered only on default port * netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java: (getUrls) when http protocol-ed url have set port its https clone is not put to the list of possible urls
author Jiri Vanek <jvanek@redhat.com>
date Tue, 18 Dec 2018 11:16:46 +0100
parents 19467a2f1f25
children 904a29fb4a0f
files ChangeLog netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Dec 18 11:16:10 2018 +0100
+++ b/ChangeLog	Tue Dec 18 11:16:46 2018 +0100
@@ -1,3 +1,9 @@
+2018-11-27  Jiri Vanek <jvanek@redhat.com>
+
+	https is preffered only on default port
+	* netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java: (getUrls) when http protocol-ed  url have set port
+	its https clone is not put to the list of possible urls
+
 2018-11-27  Jiri Vanek <jvanek@redhat.com>
 
 	PR3645, second part - following windows system paths correctly
--- a/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java	Tue Dec 18 11:16:10 2018 +0100
+++ b/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java	Tue Dec 18 11:16:46 2018 +0100
@@ -102,7 +102,7 @@
             //preffering https and  owerriding case, when applciation was moved to https, but the jnlp stayed intacted
             List<URL> urlsCopy = new LinkedList<>(urls);
             for (URL u : urlsCopy) {
-                if (u.getProtocol().equals("http")) {
+                if (u.getProtocol().equals("http") && u.getPort() < 0) {
                     try {
                         urls.add(0, copyUrltoHttps(u));
                     } catch (Exception ex) {