changeset 2197d8c7c769 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2197d8c7c769
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Nov 27 18:49:58 2018 +0100
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
diffstat:
ChangeLog | 6 ++++++
netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
diffs (25 lines):
diff -r 77e21cdc1813 -r 2197d8c7c769 ChangeLog
--- 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 at 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 at redhat.com>
PR3645, second part - following windows system paths correctly
diff -r 77e21cdc1813 -r 2197d8c7c769 netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java
--- 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) {