changeset 39128:e991a1c8b41b

8144008: Setting NO_PROXY on HTTP URL connections does not stop proxying Reviewed-by: chegar, rriggs
author vtewari
date Tue, 21 Jun 2016 14:00:59 +0100
parents 2c67712d6935
children 4b2086305b68
files jdk/src/java.base/share/classes/sun/net/NetworkClient.java jdk/test/java/net/HttpURLConnection/NoProxyTest.java
diffstat 2 files changed, 69 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/java.base/share/classes/sun/net/NetworkClient.java	Tue Jun 21 11:09:13 2016 +0800
+++ b/jdk/src/java.base/share/classes/sun/net/NetworkClient.java	Tue Jun 21 14:00:59 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -165,8 +165,10 @@
                 // server & port will be the proxy address and port
                 s = new Socket(Proxy.NO_PROXY);
             }
-        } else
+        } else {
             s = createSocket();
+        }
+
         // Instance specific timeouts do have priority, that means
         // connectTimeout & readTimeout (-1 means not set)
         // Then global default timeouts
@@ -194,7 +196,7 @@
      * to create the socket.
      */
     protected Socket createSocket() throws IOException {
-        return new java.net.Socket();
+        return new java.net.Socket(Proxy.NO_PROXY);  // direct connection
     }
 
     protected InetAddress getLocalAddress() throws IOException {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/net/HttpURLConnection/NoProxyTest.java	Tue Jun 21 14:00:59 2016 +0100
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+ /*
+ * @test
+ * @bug 8144008
+ * @summary Setting NO_PROXY on HTTP URL connections does not stop proxying
+ * @run main/othervm NoProxyTest
+ */
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.List;
+
+public class NoProxyTest {
+
+    static class NoProxyTestSelector extends ProxySelector {
+        @Override
+        public List<Proxy> select(URI uri) {
+            throw new RuntimeException("Should not reach here as proxy==Proxy.NO_PROXY");
+        }
+        @Override
+        public void connectFailed(URI u, SocketAddress s, IOException e) { }
+    }
+
+    public static void main(String args[]) throws MalformedURLException {
+        ProxySelector.setDefault(new NoProxyTestSelector());
+
+        URL url = URI.create("http://127.0.0.1/").toURL();
+        URLConnection connection;
+        try {
+            connection = url.openConnection(Proxy.NO_PROXY);
+            connection.connect();
+        } catch (IOException ignore) {
+            //ignore
+        }
+    }
+}