Skip to content

Commit

Permalink
merge dependent pr/453
Browse files Browse the repository at this point in the history
  • Loading branch information
dhanalla committed Mar 4, 2024
2 parents cbad4de + 7a17449 commit c1c11db
Show file tree
Hide file tree
Showing 3 changed files with 148 additions and 9 deletions.
16 changes: 8 additions & 8 deletions jdk/src/share/classes/java/net/doc-files/net-properties.html
Original file line number Diff line number Diff line change
Expand Up @@ -173,15 +173,15 @@ <H2>Misc HTTP properties</H2>
maximum number of idle connections that will be simultaneously kept
alive, per destination.</P>
<LI><P><B>http.keepAlive.time.server</B> and
<B>http.keepAlive.time.proxy</B> </P>
<B>http.keepAlive.time.proxy</B> </P>
<P>These properties modify the behavior of the HTTP keepalive cache in the case
where the server (or proxy) has not specified a keepalive time. If the
property is set in this case, then idle connections will be closed after the
specified number of seconds. If the property is set, and the server does
specify a keepalive time in a "Keep-Alive" response header, then the time specified
by the server is used. If the property is not set and also the server
does not specify a keepalive time, then connections are kept alive for an
implementation defined time, assuming {@code http.keepAlive} is {@code true}.</P>
where the server (or proxy) has not specified a keepalive time. If the
property is set in this case, then idle connections will be closed after the
specified number of seconds. If the property is set, and the server does
specify a keepalive time in a "Keep-Alive" response header, then the time specified
by the server is used. If the property is not set and also the server
does not specify a keepalive time, then connections are kept alive for an
implementation defined time, assuming {@code http.keepAlive} is {@code true}.</P>
<LI><P><B>http.maxRedirects</B> (default: 20)<BR>
This integer value determines the maximum number, for a given request,
of HTTP redirects that will be automatically followed by the
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/sun/net/www/http/HttpClient/KeepAliveTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
import sun.net.www.http.HttpClient;
import sun.net.www.http.KeepAliveCache;
import sun.net.www.protocol.http.HttpURLConnection;
import jdk.test.lib.net.URIBuilder;
import jdk.testlibrary.net.URIBuilder;

public class KeepAliveTest {
private static final Logger logger = Logger.getLogger("sun.net.www.protocol.http.HttpURLConnection");
Expand Down
139 changes: 139 additions & 0 deletions jdk/test/sun/net/www/http/KeepAliveCache/B8291637.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
/*
* Copyright (c) 2022, 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 8291637
* @run main/othervm -Dhttp.keepAlive.time.server=20 -esa -ea B8291637 timeout
* @run main/othervm -Dhttp.keepAlive.time.server=20 -esa -ea B8291637 max
*/

import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.*;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.CompletableFuture;

public class B8291637 {
static CompletableFuture<Boolean> passed = new CompletableFuture<>();

static class Server extends Thread {
final ServerSocket serverSocket;
final int port;
final String param; // the parameter to test "max" or "timeout"
volatile Socket s;

public Server(String param) throws IOException {
serverSocket = new ServerSocket(0);
port = serverSocket.getLocalPort();
setDaemon(true);
this.param = param;
}

public int getPort() {
return port;
}

public void close() {
try {
serverSocket.close();
if (s != null)
s.close();
} catch (IOException e) {}
}

static void readRequest(Socket s) throws IOException {
InputStream is = s.getInputStream();
is.read();
while (is.available() > 0)
is.read();
}

public void run() {
try {
while (true) {
s = serverSocket.accept();
readRequest(s);
OutputStream os = s.getOutputStream();
String resp = "" +
"HTTP/1.1 200 OK\r\n" +
"Content-Length: 11\r\n" +
"Connection: Keep-Alive\r\n" +
"Keep-Alive: " + param + "=-10\r\n" + // invalid negative value
"\r\n" +
"Hello World";
os.write(resp.getBytes(StandardCharsets.ISO_8859_1));
os.flush();
InputStream is = s.getInputStream();
long l1 = System.currentTimeMillis();
is.read();
long l2 = System.currentTimeMillis();
long diff = (l2 - l1) / 1000;
/*
* timeout is set to 20 seconds. If bug is still present
* then the timeout will occur the first time the keep alive
* thread wakes up which is after 5 seconds. This allows
* very large leeway with slow running hardware.
*
* Same behavior should occur in case of max=-1 with the bug
*/
if (diff < 19) {
passed.complete(false);
} else {
passed.complete(true);
}
System.out.println("Time diff = " + diff);
}
} catch (Throwable t) {
System.err.println("Server exception terminating: " + t);
passed.completeExceptionally(t);
}
}
}

public static void main(String[] args) throws Exception {
Server server = new Server(args[0]);
int port = server.getPort();
server.start();
URL url = new URL("http://127.0.0.1:" + Integer.toString(port) + "/");
HttpURLConnection urlc = (HttpURLConnection) url.openConnection();
InputStream i = urlc.getInputStream();
int c,count=0;
byte[] buf = new byte[256];
while ((c=i.read(buf)) != -1) {
count+=c;
}
i.close();
System.out.println("Read " + count );
try {
if (!passed.get()) {
throw new RuntimeException("Test failed");
} else {
System.out.println("Test passed");
}
} finally {
server.close();
}
}
}

0 comments on commit c1c11db

Please sign in to comment.