echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PortMapper: Fix URL generation for IPv6 hosts

Browse Source 
Console: Remove i2pwiki.i2p (ticket #2626)
This commit is contained in:
zzz
2019-10-01 16:09:17 +00:00
parent 830e08065b
commit 18ed1a6bb3
5 changed files with 67 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/src/net/i2p/util/PortMapper.java
View File

@ -280,10 +280,15 @@ public class PortMapper {
int httpPort = getPort(SVC_CONSOLE, DEFAULT_CONSOLE_PORT);
int httpsPort = getPort(SVC_HTTPS_CONSOLE);
boolean httpsOnly = httpsPort > 0 && httpHost.equals(unset) && !httpsHost.equals(unset);
if (httpsOnly)
if (httpsOnly) {
if (httpsHost.contains(":"))
return "https://[" + httpsHost + "]:" + httpsPort + '/';
return "https://" + httpsHost + ':' + httpsPort + '/';
}
if (httpHost.equals(unset))
httpHost = DEFAULT_HOST;
if (httpHost.contains(":"))
return "http://[" + httpHost + "]:" + httpPort + '/';
return "http://" + httpHost + ':' + httpPort + '/';
}
@ -298,10 +303,15 @@ public class PortMapper {
int httpPort = getPort(SVC_CONSOLE);
int httpsPort = getPort(SVC_HTTPS_CONSOLE, DEFAULT_HTTPS_CONSOLE_PORT);
boolean httpOnly = httpPort > 0 && httpsHost.equals(unset) && !httpHost.equals(unset);
if (httpOnly)
if (httpOnly) {
if (httpHost.contains(":"))
return "http://[" + httpHost + "]:" + httpPort + '/';
return "http://" + httpHost + ':' + httpPort + '/';
}
if (httpsHost.equals(unset))
return "http://" + DEFAULT_HOST + ':' + DEFAULT_CONSOLE_PORT + '/';
if (httpsHost.contains(":"))
return "https://[" + httpsHost + "]:" + httpsPort + '/';
return "https://" + httpsHost + ':' + httpsPort + '/';
}