You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2022/06/23 20:54:04 UTC

[tomcat] branch 10.0.x updated: Use connector protocol rather than hard-coding NIO

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.0.x by this push:
     new c72e57f0a9 Use connector protocol rather than hard-coding NIO
c72e57f0a9 is described below

commit c72e57f0a953807f5c8692451c90adaebefdcc5a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 23 21:53:46 2022 +0100

    Use connector protocol rather than hard-coding NIO
---
 test/org/apache/coyote/http2/Http2TestBase.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/coyote/http2/Http2TestBase.java b/test/org/apache/coyote/http2/Http2TestBase.java
index b4ffe42120..8d195182d0 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -54,7 +54,7 @@ import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.catalina.util.IOTools;
-import org.apache.coyote.http11.Http11NioProtocol;
+import org.apache.coyote.http11.AbstractHttp11Protocol;
 import org.apache.coyote.http2.HpackDecoder.HeaderEmitter;
 import org.apache.coyote.http2.Http2Parser.Input;
 import org.apache.coyote.http2.Http2Parser.Output;
@@ -609,7 +609,7 @@ public abstract class Http2TestBase extends TomcatBaseTest {
         http2Protocol.setStreamReadTimeout(5000);
         http2Protocol.setStreamWriteTimeout(5000);
         http2Protocol.setMaxConcurrentStreams(maxConcurrentStreams);
-        http2Protocol.setHttp11Protocol(new Http11NioProtocol());
+        http2Protocol.setHttp11Protocol((AbstractHttp11Protocol<?>) connector.getProtocolHandler());
         connector.addUpgradeProtocol(http2Protocol);
         if (tls) {
             // Enable TLS


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org