(tomcat) 15/16: Use constant for CONNECT

[markt]

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

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

commit 82279704a24b418536c612b4a17eeb05e8fd4917
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 11 12:33:19 2025 +0100

    Use constant for CONNECT
---
 java/org/apache/catalina/connector/CoyoteAdapter.java | 2 +-
 java/org/apache/coyote/http2/Stream.java              | 2 +-
 test/org/apache/coyote/http2/TestStreamProcessor.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 6d50d0a25e..477bb56787 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -615,7 +615,7 @@ public class CoyoteAdapter implements Adapter {
         MessageBytes decodedURI = req.decodedURI();
 
         // Filter CONNECT method
-        if ("CONNECT".equals(req.getMethod())) {
+        if (Method.CONNECT.equals(req.getMethod())) {
             response.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED, 
sm.getString("coyoteAdapter.connect"));
         } else {
             // No URI for CONNECT requests
diff --git a/java/org/apache/coyote/http2/Stream.java 
b/java/org/apache/coyote/http2/Stream.java
index 8209f9a570..263df2f583 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -554,7 +554,7 @@ class Stream extends AbstractNonZeroStream implements 
HeaderEmitter {
 
     final boolean receivedEndOfHeaders() throws ConnectionException {
         if (coyoteRequest.getMethod() == null || 
coyoteRequest.scheme().isNull() ||
-                !"CONNECT".equals(coyoteRequest.getMethod()) && 
coyoteRequest.requestURI().isNull()) {
+                !Method.CONNECT.equals(coyoteRequest.getMethod()) && 
coyoteRequest.requestURI().isNull()) {
             throw new 
ConnectionException(sm.getString("stream.header.required", getConnectionId(), 
getIdAsString()),
                     Http2Error.PROTOCOL_ERROR);
         }
diff --git a/test/org/apache/coyote/http2/TestStreamProcessor.java 
b/test/org/apache/coyote/http2/TestStreamProcessor.java
index 5cfbfb94d2..c66d0cdfcd 100644
--- a/test/org/apache/coyote/http2/TestStreamProcessor.java
+++ b/test/org/apache/coyote/http2/TestStreamProcessor.java
@@ -572,7 +572,7 @@ public class TestStreamProcessor extends Http2TestBase {
         http2Connect();
 
         List<Header> headers = new ArrayList<>(4);
-        headers.add(new Header(":method", "CONNECT"));
+        headers.add(new Header(":method", Method.CONNECT));
         headers.add(new Header(":scheme", "http"));
         headers.add(new Header(":authority", "example.local"));
 


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