8214014: Remove vestiges of gopher: protocol proxy support

Reviewed-by: lancea, alanb

src/java.base/share/classes/jdk/internal/util/SystemProps.java

@@ -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;

src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java

@@ -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;
         }

src/java.base/share/conf/net.properties

@@ -14,7 +14,7 @@
 # Note that the system properties that do explicitly set proxies
 # (like http.proxyHost) do take precedence over the system settings
 # even if java.net.useSystemProxies is set to true.
- 
+
 java.net.useSystemProxies=false
 
 #------------------------------------------------------------------------
@@ -51,13 +51,6 @@ http.nonProxyHosts=localhost|127.*|[::1]
 # ftp.proxyPort=80
 ftp.nonProxyHosts=localhost|127.*|[::1]
 #
-# Gopher Proxy settings. proxyHost is the name of the proxy server
-# (e.g. proxy.mydomain.com), proxyPort is the port number to use (default
-# value is 80)
-#
-# gopher.proxyHost=
-# gopher.proxyPort=80
-#
 # Socks proxy settings. socksProxyHost is the name of the proxy server
 # (e.g. socks.domain.com), socksProxyPort is the port number to use
 # (default value is 1080)
@@ -66,8 +59,8 @@ ftp.nonProxyHosts=localhost|127.*|[::1]
 # socksProxyPort=1080
 #
 # HTTP Keep Alive settings. remainingData is the maximum amount of data
-# in kilobytes that will be cleaned off the underlying socket so that it 
-# can be reused (default value is 512K), queuedConnections is the maximum 
+# in kilobytes that will be cleaned off the underlying socket so that it
+# can be reused (default value is 512K), queuedConnections is the maximum
 # number of Keep Alive connections to be on the queue for clean up (default
 # value is 10).
 # http.KeepAlive.remainingData=512
@@ -105,10 +98,10 @@ jdk.http.auth.tunneling.disabledSchemes=Basic
 # By default, the following request headers are not allowed to be set by user code
 # in HttpRequests: "connection", "content-length", "expect", "host" and "upgrade".
 # The 'jdk.httpclient.allowRestrictedHeaders' property allows one or more of these
-# headers to be specified as a comma separated list to override the default restriction. 
-# The names are case-insensitive and white-space is ignored (removed before processing 
-# the list). Note, this capability is mostly intended for testing and isn't expected 
-# to be used in real deployments. Protocol errors or other undefined behavior is likely 
+# headers to be specified as a comma separated list to override the default restriction.
+# The names are case-insensitive and white-space is ignored (removed before processing
+# the list). Note, this capability is mostly intended for testing and isn't expected
+# to be used in real deployments. Protocol errors or other undefined behavior is likely
 # to occur when using them. The property is not set by default.
 # Note also, that there may be other headers that are restricted from being set
 # depending on the context. This includes the "Authorization" header when the

src/java.base/share/native/libjava/System.c

@@ -184,15 +184,6 @@ Java_jdk_internal_util_SystemProps_00024Raw_platformProperties(JNIEnv *env, jcla
         PUTPROP(propArray, _socksProxyPort_NDX, sprops->socksPort);
     }
 
-    if (sprops->gopherProxyEnabled) {
-        // The gopher client is different in that it expects an 'is this set?' flag that the others don't.
-        PUTPROP(propArray, _gopherProxySet_NDX, "true");
-        PUTPROP(propArray, _gopherProxyHost_NDX, sprops->gopherHost);
-        PUTPROP(propArray, _gopherProxyPort_NDX, sprops->gopherPort);
-    } else {
-        PUTPROP(propArray, _gopherProxySet_NDX, "false");
-    }
-
     // Mac OS X only has a single proxy exception list which applies
     // to all protocols
     if (sprops->exceptionList) {

src/java.base/share/native/libjava/java_props.h

@@ -106,10 +106,6 @@ typedef struct {
     char *socksHost;
     char *socksPort;
 
-    int gopherProxyEnabled;
-    char *gopherHost;
-    char *gopherPort;
-
     char *exceptionList;
 
     char *awt_headless;  /* java.awt.headless setting, if NULL (default) will not be set */