Mercurial > hg > release > icedtea-web-1.8
changeset 1524:2197d8c7c769
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, 27 Nov 2018 18:49:58 +0100 |
parents | 77e21cdc1813 |
children | 2739172a7702 |
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 Nov 27 16:07:20 2018 +0100 +++ b/ChangeLog Tue Nov 27 18:49:58 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 Nov 27 16:07:20 2018 +0100 +++ b/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java Tue Nov 27 18:49:58 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) {