archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8214014: Remove vestiges of gopher: protocol proxy support

Browse source 
Reviewed-by: lancea, alanb
This commit is contained in:
Roger Riggs 2018-11-28 16:04:36 -05:00
parent c1034b1cad
commit 48d68d182a
12 changed files with 10 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/java.base/share/classes/jdk/internal/util/SystemProps.java
View file

@ -85,9 +85,6 @@ public final class SystemProps {
putIfAbsent(props, "ftp.proxyPort", raw.propDefault(Raw._ftp_proxyPort_NDX));
putIfAbsent(props, "socksProxyHost", raw.propDefault(Raw._socksProxyHost_NDX));
putIfAbsent(props, "socksProxyPort", raw.propDefault(Raw._socksProxyPort_NDX));
putIfAbsent(props, "gopherProxySet", raw.propDefault(Raw._gopherProxySet_NDX));
putIfAbsent(props, "gopherProxyHost", raw.propDefault(Raw._gopherProxyHost_NDX));
putIfAbsent(props, "gopherProxyPort", raw.propDefault(Raw._gopherProxyPort_NDX));
putIfAbsent(props, "http.nonProxyHosts", raw.propDefault(Raw._http_nonProxyHosts_NDX));
putIfAbsent(props, "ftp.nonProxyHosts", raw.propDefault(Raw._ftp_nonProxyHosts_NDX));
putIfAbsent(props, "socksNonProxyHosts", raw.propDefault(Raw._socksNonProxyHosts_NDX));
@ -201,10 +198,7 @@ public final class SystemProps {
@Native private static final int _ftp_nonProxyHosts_NDX = 1 + _format_variant_NDX;
@Native private static final int _ftp_proxyHost_NDX = 1 + _ftp_nonProxyHosts_NDX;
@Native private static final int _ftp_proxyPort_NDX = 1 + _ftp_proxyHost_NDX;
@Native private static final int _gopherProxyHost_NDX = 1 + _ftp_proxyPort_NDX;
@Native private static final int _gopherProxyPort_NDX = 1 + _gopherProxyHost_NDX;
@Native private static final int _gopherProxySet_NDX = 1 + _gopherProxyPort_NDX;
@Native private static final int _http_nonProxyHosts_NDX = 1 + _gopherProxySet_NDX;
@Native private static final int _http_nonProxyHosts_NDX = 1 + _ftp_proxyPort_NDX;
@Native private static final int _http_proxyHost_NDX = 1 + _http_nonProxyHosts_NDX;
@Native private static final int _http_proxyPort_NDX = 1 + _http_proxyHost_NDX;
@Native private static final int _https_proxyHost_NDX = 1 + _http_proxyPort_NDX;

4
src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java
View file

@ -53,7 +53,6 @@ import static java.util.stream.Collectors.toList;
*
* Supports http/https/ftp.proxyHost, http/https/ftp.proxyPort,
* proxyHost, proxyPort, and http/https/ftp.nonProxyHost, and socks.
* NOTE: need to do gopher as well
*/
public class DefaultProxySelector extends ProxySelector {
@ -82,7 +81,6 @@ public class DefaultProxySelector extends ProxySelector {
{"http", "http.proxy", "proxy", "socksProxy"},
{"https", "https.proxy", "proxy", "socksProxy"},
{"ftp", "ftp.proxy", "ftpProxy", "proxy", "socksProxy"},
{"gopher", "gopherProxy", "socksProxy"},
{"socket", "socksProxy"}
};
@ -350,8 +348,6 @@ public class DefaultProxySelector extends ProxySelector {
return 80;
} else if ("socket".equalsIgnoreCase(protocol)) {
return 1080;
} else if ("gopher".equalsIgnoreCase(protocol)) {
return 80;
} else {
return -1;
}