HTTP client idle timeout should reset the stream with CANCEL (8) the …

…HTTP/2 stream instead of resetting with a NO_ERROR (0) code.

Expand the timeout tests to HTTP/2

src/main/java/io/vertx/core/http/impl/Http2ClientConnection.java

@@ -17,6 +17,7 @@
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http2.*;
 import io.netty.handler.timeout.IdleStateEvent;
+import io.netty.handler.timeout.TimeoutException;
 import io.vertx.core.*;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.*;
@@ -661,7 +662,14 @@ public void doSetWriteQueueMaxSize(int size) {
 
     @Override
     public void reset(Throwable cause) {
-      long code = cause instanceof StreamResetException ? ((StreamResetException)cause).getCode() : 0;
+      long code;
+      if (cause instanceof StreamResetException) {
+        code = ((StreamResetException)cause).getCode();
+      } else if (cause instanceof java.util.concurrent.TimeoutException) {
+        code = 0x08L; // CANCEL
+      } else {
+        code = 0L;
+      }
       conn.context.emit(code, this::writeReset);
     }
 

src/test/java/io/vertx/core/http/Http1xClientTimeoutTest.java

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2011-2023 Contributors to the Eclipse Foundation
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ * which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ */
+package io.vertx.core.http;
+
+public class Http1xClientTimeoutTest extends HttpClientTimeoutTest {
+}

src/test/java/io/vertx/core/http/Http2ClientTimeoutTest.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2011-2023 Contributors to the Eclipse Foundation
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ * which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ */
+package io.vertx.core.http;
+
+public class Http2ClientTimeoutTest extends HttpClientTimeoutTest {
+
+  @Override
+  protected HttpServerOptions createBaseServerOptions() {
+    return Http2ServerTest.createHttp2ServerOptions(HttpTestBase.DEFAULT_HTTPS_PORT, HttpTestBase.DEFAULT_HTTPS_HOST);
+  }
+
+  @Override
+  protected HttpClientOptions createBaseClientOptions() {
+    return Http2ServerTest.createHttp2ClientOptions();
+  }
+}