jdk-sandbox: comparison test/jdk/java/net/httpclient/http2/server/Http2TestServerConnection.java

equal deleted inserted replaced

-:bbd688c6fbbb
+:cf8792f51dee
 /*
-* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2018, 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.
 if (Arrays.compare(clientPreface, bytes) != 0) {
 throw new IOException("Invalid preface: " + new String(bytes, 0, len));
 }
 }
-String doUpgrade() throws IOException {
+Http1InitialRequest doUpgrade() throws IOException {
-String upgrade = readHttp1Request();
+Http1InitialRequest upgrade = readHttp1Request();
-String h2c = getHeader(upgrade, "Upgrade");
+String h2c = getHeader(upgrade.headers, "Upgrade");
 if (h2c == null || !h2c.equals("h2c")) {
 System.err.println("Server:HEADERS: " + upgrade);
 throw new IOException("Bad upgrade 1 " + h2c);
 }
 "Upgrade", "h2c");
 sendSettingsFrame();
 readPreface();
-String clientSettingsString = getHeader(upgrade, "HTTP2-Settings");
+String clientSettingsString = getHeader(upgrade.headers, "HTTP2-Settings");
 clientSettings = getSettingsFromString(clientSettingsString);
 return upgrade;
 }
 throw new IOException("Expected SettingsFrame");
 return (SettingsFrame)frame;
 }
 void run() throws Exception {
-String upgrade = null;
+Http1InitialRequest upgrade = null;
 if (!secure) {
 upgrade = doUpgrade();
 } else {
 readPreface();
 sendSettingsFrame(true);
 }
 }
 // First stream (1) comes from a plaintext HTTP/1.1 request
 @SuppressWarnings({"rawtypes","unchecked"})
-void createPrimordialStream(String request) throws IOException {
+void createPrimordialStream(Http1InitialRequest request) throws IOException {
 HttpHeadersImpl headers = new HttpHeadersImpl();
-String requestLine = getRequestLine(request);
+String requestLine = getRequestLine(request.headers);
 String[] tokens = requestLine.split(" ");
 if (!tokens[2].equals("HTTP/1.1")) {
 throw new IOException("bad request line");
 }
 URI uri = null;
 try {
 uri = new URI(tokens[1]);
 } catch (URISyntaxException e) {
 throw new IOException(e);
 }
-String host = getHeader(request, "Host");
+String host = getHeader(request.headers, "Host");
 if (host == null) {
 throw new IOException("missing Host");
 }
 headers.setHeader(":method", tokens[0]);
 headers.setHeader(":scheme", "http"); // always in this case
 headers.setHeader(":authority", host);
 headers.setHeader(":path", uri.getPath());
 Queue q = new Queue(sentinel);
-String body = getRequestBody(request);
+byte[] body = getRequestBody(request);
-addHeaders(getHeaders(request), headers);
+addHeaders(getHeaders(request.headers), headers);
-headers.setHeader("Content-length", Integer.toString(body.length()));
+headers.setHeader("Content-length", Integer.toString(body.length));
 addRequestBodyToQueue(body, q);
 streams.put(1, q);
 exec.submit(() -> {
 handleRequest(headers, q, 1, true /*complete request has been read*/);
 }
 final static String CRLF = "\r\n";
 final static String CRLFCRLF = "\r\n\r\n";
-String readHttp1Request() throws IOException {
+static class Http1InitialRequest {
+final String headers;
+final byte[] body;
+Http1InitialRequest(String headers, byte[] body) {
+this.headers = headers;
+this.body = body.clone();
+}
+}
+Http1InitialRequest readHttp1Request() throws IOException {
 String headers = readUntil(CRLF + CRLF);
 int clen = getContentLength(headers);
 String te = getHeader(headers, "Transfer-encoding");
 byte[] buf = new byte[0];
 try {
 is.readNBytes(buf, 0, clen);
 } else if ("chunked".equalsIgnoreCase(te)) {
 //  HTTP/1.1 chunked data, read it
 buf = readChunkedInputStream(is);
 }
-String body = new String(buf, StandardCharsets.US_ASCII);
+return new Http1InitialRequest(headers, buf);
-return headers + body;
 } catch (IOException e) {
 System.err.println("TestServer: headers read: [ " + headers + " ]");
 throw e;
 }
 }
 final static ByteBuffer[] bbarray = new ByteBuffer[0];
 // wrapper around a BlockingQueue that throws an exception when it's closed
 // Each stream has one of these
-String getRequestBody(String request) {
+byte[] getRequestBody(Http1InitialRequest request) {
-int bodystart = request.indexOf(CRLF+CRLF);
+return request.body;
-String body;
-if (bodystart == -1)
-body = "";
-else
-body = request.substring(bodystart+4);
-return body;
 }
 @SuppressWarnings({"rawtypes","unchecked"})
-void addRequestBodyToQueue(String body, Queue q) throws IOException {
+void addRequestBodyToQueue(byte[] body, Queue q) throws IOException {
-ByteBuffer buf = ByteBuffer.wrap(body.getBytes(StandardCharsets.US_ASCII));
+ByteBuffer buf = ByteBuffer.wrap(body);
 DataFrame df = new DataFrame(1, DataFrame.END_STREAM, buf);
 // only used for primordial stream
 q.put(df);
 }

branch	http-client-branch
changeset 56009	cf8792f51dee
parent 55973	4d9b002587db
child 56019	2cb33775fc6f