(tomcat) branch main updated: Future proof remaining request builders

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 45556b97eb Future proof remaining request builders
45556b97eb is described below

commit 45556b97ebeba2e54d338ed66af721725eab4cec
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 23 11:34:37 2026 +0100

    Future proof remaining request builders
---
 test/org/apache/coyote/http2/Http2TestBase.java | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/test/org/apache/coyote/http2/Http2TestBase.java 
b/test/org/apache/coyote/http2/Http2TestBase.java
index 5ef72be778..5b01366f9b 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -226,7 +226,11 @@ public abstract class Http2TestBase extends TomcatBaseTest 
{
             String url) {
         List<Header> headers = new ArrayList<>(4);
         headers.add(new Header(":method", Method.GET));
-        headers.add(new Header(":scheme", "http"));
+        if (getTomcatInstance().getConnector().getSecure()) {
+            headers.add(new Header(":scheme", "https"));
+        } else {
+            headers.add(new Header(":scheme", "http"));
+        }
         headers.add(new Header(":path", url));
         headers.add(new Header(":authority", "localhost:" + getPort()));
 
@@ -264,7 +268,11 @@ public abstract class Http2TestBase extends TomcatBaseTest 
{
     protected void buildSimpleGetRequestPart1(byte[] frameHeader, ByteBuffer 
headersPayload, int streamId) {
         List<Header> headers = new ArrayList<>(3);
         headers.add(new Header(":method", Method.GET));
-        headers.add(new Header(":scheme", "http"));
+        if (getTomcatInstance().getConnector().getSecure()) {
+            headers.add(new Header(":scheme", "https"));
+        } else {
+            headers.add(new Header(":scheme", "http"));
+        }
         headers.add(new Header(":path", "/simple"));
 
         buildSimpleGetRequestPart1(frameHeader, headersPayload, headers, 
streamId);
@@ -457,7 +465,11 @@ public abstract class Http2TestBase extends TomcatBaseTest 
{
     protected void buildHeadRequest(byte[] headersFrameHeader, ByteBuffer 
headersPayload, int streamId, String path) {
         MimeHeaders headers = new MimeHeaders();
         headers.addValue(":method").setString(Method.HEAD);
-        headers.addValue(":scheme").setString("http");
+        if (getTomcatInstance().getConnector().getSecure()) {
+            headers.addValue(":scheme").setString("https");
+        } else {
+            headers.addValue(":scheme").setString("http");
+        }
         headers.addValue(":path").setString(path);
         headers.addValue(":authority").setString("localhost:" + getPort());
         hpackEncoder.encode(headers, headersPayload);


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