author | chegar |
Fri, 27 Sep 2019 09:55:35 +0100 | |
changeset 58365 | 73950479184b |
parent 49765 | ee6f7a61f3a5 |
child 56451 | 9585061fdb04 |
permissions | -rw-r--r-- |
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
1 |
/* |
49765 | 2 |
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. |
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
4 |
* |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
8 |
* |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
13 |
* accompanied this code). |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
14 |
* |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
18 |
* |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
21 |
* questions. |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
22 |
*/ |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
23 |
|
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
24 |
/* |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
25 |
* @test |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
26 |
* @bug 8175814 |
49765 | 27 |
* @modules java.net.http java.logging jdk.httpserver |
28 |
* @library /lib/testlibrary/ / |
|
29 |
* @build ProxyServer |
|
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
30 |
* @run main/othervm -Djdk.httpclient.HttpClient.log=errors,requests,headers,trace VersionTest |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
31 |
*/ |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
32 |
|
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
33 |
import com.sun.net.httpserver.Headers; |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
34 |
import com.sun.net.httpserver.HttpContext; |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
35 |
import com.sun.net.httpserver.HttpExchange; |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
36 |
import com.sun.net.httpserver.HttpHandler; |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
37 |
import com.sun.net.httpserver.HttpServer; |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
38 |
import java.io.IOException; |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
39 |
import java.io.OutputStream; |
49765 | 40 |
import java.net.InetAddress; |
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
41 |
import java.net.URI; |
49765 | 42 |
import java.net.InetSocketAddress; |
43 |
import java.net.ProxySelector; |
|
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
44 |
import java.util.concurrent.Executors; |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
45 |
import java.util.concurrent.ExecutorService; |
49765 | 46 |
import java.net.http.HttpClient; |
47 |
import java.net.http.HttpRequest; |
|
48 |
import java.net.http.HttpResponse; |
|
49 |
import java.net.http.HttpResponse.BodyHandlers; |
|
50 |
import static java.net.http.HttpClient.Version.HTTP_1_1; |
|
51 |
import static java.net.http.HttpClient.Version.HTTP_2; |
|
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
52 |
|
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
53 |
public class VersionTest { |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
54 |
static HttpServer s1 ; |
49765 | 55 |
static ProxyServer proxy; |
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
56 |
static ExecutorService executor; |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
57 |
static int port; |
49765 | 58 |
static InetSocketAddress proxyAddr; |
59 |
static HttpClient client, clientWithProxy; |
|
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
60 |
static URI uri; |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
61 |
static volatile boolean error = false; |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
62 |
|
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
63 |
public static void main(String[] args) throws Exception { |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
64 |
initServer(); |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
65 |
|
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
66 |
client = HttpClient.newBuilder() |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
67 |
.executor(executor) |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
68 |
.build(); |
49765 | 69 |
|
70 |
clientWithProxy = HttpClient.newBuilder() |
|
71 |
.executor(executor) |
|
72 |
.proxy(ProxySelector.of(proxyAddr)) |
|
73 |
.build(); |
|
74 |
||
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
75 |
// first check that the version is HTTP/2 |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
76 |
if (client.version() != HttpClient.Version.HTTP_2) { |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
77 |
throw new RuntimeException("Default version not HTTP_2"); |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
78 |
} |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
79 |
try { |
49765 | 80 |
test(HTTP_1_1, false); |
81 |
test(HTTP_2, false); |
|
82 |
test(HTTP_2, true); |
|
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
83 |
} finally { |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
84 |
s1.stop(0); |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
85 |
executor.shutdownNow(); |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
86 |
} |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
87 |
if (error) |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
88 |
throw new RuntimeException(); |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
89 |
} |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
90 |
|
49765 | 91 |
public static void test(HttpClient.Version version, boolean proxy) throws Exception { |
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
92 |
HttpRequest r = HttpRequest.newBuilder(uri) |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
93 |
.version(version) |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
94 |
.GET() |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
95 |
.build(); |
49765 | 96 |
HttpClient c = proxy ? clientWithProxy : client; |
97 |
HttpResponse<Void> resp = c.send(r, BodyHandlers.discarding()); |
|
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
98 |
System.out.printf("Client: response is %d\n", resp.statusCode()); |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
99 |
if (resp.version() != HTTP_1_1) { |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
100 |
throw new RuntimeException(); |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
101 |
} |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
102 |
//System.out.printf("Client: response body is %s\n", resp.body()); |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
103 |
} |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
104 |
|
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
105 |
static void initServer() throws Exception { |
49765 | 106 |
InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0); |
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
107 |
s1 = HttpServer.create (addr, 0); |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
108 |
HttpHandler h = new Handler(); |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
109 |
|
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
110 |
HttpContext c1 = s1.createContext("/", h); |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
111 |
|
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
112 |
executor = Executors.newCachedThreadPool(); |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
113 |
s1.setExecutor(executor); |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
114 |
s1.start(); |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
115 |
|
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
116 |
port = s1.getAddress().getPort(); |
49765 | 117 |
uri = new URI("http://localhost:" + Integer.toString(port) + "/foo"); |
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
118 |
System.out.println("HTTP server port = " + port); |
49765 | 119 |
proxy = new ProxyServer(0, false); |
120 |
int proxyPort = proxy.getPort(); |
|
121 |
proxyAddr = new InetSocketAddress(InetAddress.getLoopbackAddress(), proxyPort); |
|
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
122 |
} |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
123 |
|
49765 | 124 |
static class Handler implements HttpHandler { |
125 |
int counter; |
|
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
126 |
|
49765 | 127 |
void checkHeader(Headers h) { |
128 |
counter++; |
|
129 |
if (counter == 1 && h.containsKey("Upgrade")) { |
|
130 |
VersionTest.error = true; |
|
131 |
} |
|
132 |
if (counter == 2 && !h.containsKey("Upgrade")) { |
|
133 |
VersionTest.error = true; |
|
134 |
} |
|
135 |
if (counter == 3 && h.containsKey("Upgrade")) { |
|
136 |
VersionTest.error = true; |
|
137 |
} |
|
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
138 |
} |
49765 | 139 |
|
140 |
@Override |
|
141 |
public synchronized void handle(HttpExchange t) throws IOException { |
|
142 |
String reply = "Hello world"; |
|
143 |
int len = reply.length(); |
|
144 |
Headers h = t.getRequestHeaders(); |
|
145 |
checkHeader(h); |
|
146 |
System.out.printf("Sending response 200\n"); |
|
147 |
t.sendResponseHeaders(200, len); |
|
148 |
OutputStream o = t.getResponseBody(); |
|
149 |
o.write(reply.getBytes()); |
|
150 |
t.close(); |
|
44854
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
151 |
} |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
152 |
} |
5a486e0acd29
8175814: Update default HttpClient protocol version and optional request version
michaelm
parents:
diff
changeset
|
153 |
} |