This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 13d1555aa47fab6a5e7e0aee4bb6f81d6d80cc57 Author: Dimitris Soumis <[email protected]> AuthorDate: Fri Feb 27 13:15:44 2026 +0200 Comply with JDK11 --- .../apache/catalina/startup/TomcatBaseTest.java | 2 - .../httpd/HttpdIntegrationBaseTest.java | 34 ++++++------- .../tomcat/integration/httpd/TestBasicProxy.java | 22 ++++----- .../TestChunkedTransferEncodingWithProxy.java | 16 +++---- .../integration/httpd/TestErrorHandling.java | 18 ++++--- .../integration/httpd/TestFullReverseProxy.java | 56 +++++++++++----------- .../httpd/TestLargePayloadWithProxy.java | 12 ++--- .../httpd/TestRemoteIpValveWithProxy.java | 26 +++++----- .../integration/httpd/TestSSLValveWithProxy01.java | 42 ++++++++-------- .../integration/httpd/TestSSLValveWithProxy02.java | 48 +++++++++---------- .../integration/httpd/TestSessionWithProxy.java | 38 +++++++-------- .../tomcat/integration/httpd/TesterHttpd.java | 6 ++- 12 files changed, 159 insertions(+), 161 deletions(-) diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java b/test/org/apache/catalina/startup/TomcatBaseTest.java index 26076aa208..8f3a74c1b1 100644 --- a/test/org/apache/catalina/startup/TomcatBaseTest.java +++ b/test/org/apache/catalina/startup/TomcatBaseTest.java @@ -22,7 +22,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.PrintWriter; -import java.io.Serial; import java.net.HttpURLConnection; import java.net.InetAddress; import java.net.URL; @@ -466,7 +465,6 @@ public abstract class TomcatBaseTest extends LoggingBaseTest { */ public static final class SnoopServlet extends HttpServlet { - @Serial private static final long serialVersionUID = 1L; @Override diff --git a/test/org/apache/tomcat/integration/httpd/HttpdIntegrationBaseTest.java b/test/org/apache/tomcat/integration/httpd/HttpdIntegrationBaseTest.java index f54c2d7cee..86441eb737 100644 --- a/test/org/apache/tomcat/integration/httpd/HttpdIntegrationBaseTest.java +++ b/test/org/apache/tomcat/integration/httpd/HttpdIntegrationBaseTest.java @@ -44,26 +44,26 @@ import org.apache.tomcat.util.net.TesterSupport; public abstract class HttpdIntegrationBaseTest extends TomcatBaseTest { private static final String HTTPD_CONFIG = - """ - Listen %{HTTPD_PORT} - PidFile %{CONF_DIR}/httpd.pid - LoadModule authz_core_module modules/mod_authz_core.so - """ + + "Listen %{HTTPD_PORT}\n" + + "PidFile %{CONF_DIR}/httpd.pid\n" + + "LoadModule authz_core_module modules/mod_authz_core.so\n" + + (JrePlatform.IS_WINDOWS ? - """ - ErrorLog "|C:/Windows/System32/more.com" - """ + + "ErrorLog \"|C:/Windows/System32/more.com\"\n" + : - """ - LoadModule unixd_module modules/mod_unixd.so - LoadModule mpm_event_module modules/mod_mpm_event.so - ErrorLog /dev/stderr - """ + + "LoadModule unixd_module modules/mod_unixd.so\n" + + "LoadModule mpm_event_module modules/mod_mpm_event.so\n" + + "ErrorLog /dev/stderr\n" + ) + - """ - LogLevel warn - ServerName localhost:%{HTTPD_PORT} - """; + + "LogLevel warn\n" + + "ServerName localhost:%{HTTPD_PORT}\n" + ; private static final String SERVLET_NAME = "snoop"; diff --git a/test/org/apache/tomcat/integration/httpd/TestBasicProxy.java b/test/org/apache/tomcat/integration/httpd/TestBasicProxy.java index e27c73b79d..a9592ad2f5 100644 --- a/test/org/apache/tomcat/integration/httpd/TestBasicProxy.java +++ b/test/org/apache/tomcat/integration/httpd/TestBasicProxy.java @@ -30,17 +30,17 @@ import org.apache.tomcat.util.buf.ByteChunk; public class TestBasicProxy extends HttpdIntegrationBaseTest { - private static final String HTTPD_CONFIG = """ - LoadModule proxy_module modules/mod_proxy.so - LoadModule proxy_http_module modules/mod_proxy_http.so - LoadModule headers_module modules/mod_headers.so - ProxyRequests Off - ProxyPreserveHost On - ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - RequestHeader set X-Forwarded-For 140.211.11.130 - RequestHeader set X-Forwarded-Proto "https" - """; + private static final String HTTPD_CONFIG = + "LoadModule proxy_module modules/mod_proxy.so\n" + + "LoadModule proxy_http_module modules/mod_proxy_http.so\n" + + "LoadModule headers_module modules/mod_headers.so\n" + + "ProxyRequests Off\n" + + "ProxyPreserveHost On\n" + + "ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}\n"; + + "ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}\n"; + + "RequestHeader set X-Forwarded-For 140.211.11.130\n" + + "RequestHeader set X-Forwarded-Proto \"https\"" + ; @Override protected List<Valve> getValveConfig() { diff --git a/test/org/apache/tomcat/integration/httpd/TestChunkedTransferEncodingWithProxy.java b/test/org/apache/tomcat/integration/httpd/TestChunkedTransferEncodingWithProxy.java index f051a4ad2c..bc748a84be 100644 --- a/test/org/apache/tomcat/integration/httpd/TestChunkedTransferEncodingWithProxy.java +++ b/test/org/apache/tomcat/integration/httpd/TestChunkedTransferEncodingWithProxy.java @@ -36,14 +36,14 @@ public class TestChunkedTransferEncodingWithProxy extends HttpdIntegrationBaseTe private static final int PAYLOAD_SIZE = 10 * 1024 * 1024 * 100; - private static final String HTTPD_CONFIG = """ - LoadModule env_module modules/mod_env.so \s - SetEnv proxy-sendchunked 1 - LoadModule proxy_module modules/mod_proxy.so - LoadModule proxy_http_module modules/mod_proxy_http.so - ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - """; + private static final String HTTPD_CONFIG = + "LoadModule env_module modules/mod_env.so\n" + + "SetEnv proxy-sendchunked 1\n" + + "LoadModule proxy_module modules/mod_proxy.so\n" + + "LoadModule proxy_http_module modules/mod_proxy_http.so\n" + + "ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}\n"; + + "ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}"; + ; @Override protected List<Valve> getValveConfig() { diff --git a/test/org/apache/tomcat/integration/httpd/TestErrorHandling.java b/test/org/apache/tomcat/integration/httpd/TestErrorHandling.java index f6601ccc05..06b562ecc1 100644 --- a/test/org/apache/tomcat/integration/httpd/TestErrorHandling.java +++ b/test/org/apache/tomcat/integration/httpd/TestErrorHandling.java @@ -17,7 +17,6 @@ package org.apache.tomcat.integration.httpd; -import java.io.Serial; import java.util.ArrayList; import java.util.List; @@ -36,14 +35,14 @@ import org.apache.tomcat.util.buf.ByteChunk; public class TestErrorHandling extends HttpdIntegrationBaseTest { - private static final String HTTPD_CONFIG = """ - LoadModule proxy_module modules/mod_proxy.so - LoadModule proxy_http_module modules/mod_proxy_http.so - ProxyRequests Off - ProxyPreserveHost On - ProxyPass / http://localhost:%{TOMCAT_PORT}/ - ProxyPassReverse / http://localhost:%{TOMCAT_PORT}/ - """; + private static final String HTTPD_CONFIG = + "LoadModule proxy_module modules/mod_proxy.so\n" + + "LoadModule proxy_http_module modules/mod_proxy_http.so\n" + + "ProxyRequests Off\n" + + "ProxyPreserveHost On\n" + + "ProxyPass / http://localhost:%{TOMCAT_PORT}/\n"; + + "ProxyPassReverse / http://localhost:%{TOMCAT_PORT}/"; + ; @Override protected List<Valve> getValveConfig() { @@ -65,7 +64,6 @@ public class TestErrorHandling extends HttpdIntegrationBaseTest { public void test500InternalError() throws Exception { Context ctx = (Context) getTomcatInstance().getHost().findChildren()[0]; Tomcat.addServlet(ctx, "error", new HttpServlet() { - @Serial private static final long serialVersionUID = 1L; @Override diff --git a/test/org/apache/tomcat/integration/httpd/TestFullReverseProxy.java b/test/org/apache/tomcat/integration/httpd/TestFullReverseProxy.java index 829bd500cc..ff6449a65e 100644 --- a/test/org/apache/tomcat/integration/httpd/TestFullReverseProxy.java +++ b/test/org/apache/tomcat/integration/httpd/TestFullReverseProxy.java @@ -33,34 +33,34 @@ import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.net.TesterSupport; public class TestFullReverseProxy extends HttpdIntegrationBaseTest { - private static final String HTTPD_CONFIG = """ - LoadModule proxy_module modules/mod_proxy.so - LoadModule proxy_http_module modules/mod_proxy_http.so - LoadModule headers_module modules/mod_headers.so - LoadModule ssl_module modules/mod_ssl.so - SSLSessionCache none - Listen %{HTTPD_SSL_PORT} https - <VirtualHost *:%{HTTPD_SSL_PORT}> - ServerName localhost:%{HTTPD_SSL_PORT} - SSLEngine on - SSLCertificateFile "%{SSL_CERT_FILE}" - SSLCertificateKeyFile "%{SSL_KEY_FILE}" - ProxyRequests Off - ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - RequestHeader set SSL_CLIENT_CERT "%{SSL_CLIENT_CERT}s" - RequestHeader set SSL_CIPHER "%{SSL_CIPHER}s" - RequestHeader set SSL_SESSION_ID "%{SSL_SESSION_ID}s" - RequestHeader set SSL_CIPHER_USEKEYSIZE "%{SSL_CIPHER_USEKEYSIZE}s" - SSLVerifyClient optional - SSLCACertificateFile "%{SSL_CA_CERT_FILE}" - SSLOptions +ExportCertData - ProxyAddHeaders Off - RequestHeader set X-Forwarded-For 140.211.11.130 - RequestHeader set X-Forwarded-Proto https - RequestHeader set X-Forwarded-Host whoamI.tomcat - </VirtualHost> - """; + private static final String HTTPD_CONFIG = + "LoadModule proxy_module modules/mod_proxy.so\n" + + "LoadModule proxy_http_module modules/mod_proxy_http.so\n" + + "LoadModule headers_module modules/mod_headers.so\n" + + "LoadModule ssl_module modules/mod_ssl.so\n" + + "SSLSessionCache none\n" + + "Listen %{HTTPD_SSL_PORT} https\n" + + "<VirtualHost *:%{HTTPD_SSL_PORT}>\n" + + "ServerName localhost:%{HTTPD_SSL_PORT}\n" + + "SSLEngine on\n" + + "SSLCertificateFile \"%{SSL_CERT_FILE}\"\n" + + "SSLCertificateKeyFile \"%{SSL_KEY_FILE}\"\n" + + "ProxyRequests Off\n" + + "ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}\n"; + + "ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}\n"; + + "RequestHeader set SSL_CLIENT_CERT \"%{SSL_CLIENT_CERT}s\"\n" + + "RequestHeader set SSL_CIPHER \"%{SSL_CIPHER}s\"\n" + + "RequestHeader set SSL_SESSION_ID \"%{SSL_SESSION_ID}s\"\n" + + "RequestHeader set SSL_CIPHER_USEKEYSIZE \"%{SSL_CIPHER_USEKEYSIZE}s\"\n" + + "SSLVerifyClient optional\n" + + "SSLCACertificateFile \"%{SSL_CA_CERT_FILE}\"\n" + + "SSLOptions +ExportCertData\n" + + "ProxyAddHeaders Off\n" + + "RequestHeader set X-Forwarded-For 140.211.11.130\n" + + "RequestHeader set X-Forwarded-Proto https\n" + + "RequestHeader set X-Forwarded-Host whoamI.tomcat\n" + + "</VirtualHost>" + ; @Override protected List<Valve> getValveConfig() { diff --git a/test/org/apache/tomcat/integration/httpd/TestLargePayloadWithProxy.java b/test/org/apache/tomcat/integration/httpd/TestLargePayloadWithProxy.java index 992d0ce6dd..9c93649c6d 100644 --- a/test/org/apache/tomcat/integration/httpd/TestLargePayloadWithProxy.java +++ b/test/org/apache/tomcat/integration/httpd/TestLargePayloadWithProxy.java @@ -36,12 +36,12 @@ public class TestLargePayloadWithProxy extends HttpdIntegrationBaseTest { private static final int PAYLOAD_SIZE = 10 * 1024 * 1024; - private static final String HTTPD_CONFIG = """ - LoadModule proxy_module modules/mod_proxy.so - LoadModule proxy_http_module modules/mod_proxy_http.so - ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - """; + private static final String HTTPD_CONFIG = + "LoadModule proxy_module modules/mod_proxy.so\n" + + "LoadModule proxy_http_module modules/mod_proxy_http.so\n" + + "ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}\n"; + + "ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}"; + ; @Override protected List<Valve> getValveConfig() { diff --git a/test/org/apache/tomcat/integration/httpd/TestRemoteIpValveWithProxy.java b/test/org/apache/tomcat/integration/httpd/TestRemoteIpValveWithProxy.java index 24dfe2fc1c..cadb47ecc2 100644 --- a/test/org/apache/tomcat/integration/httpd/TestRemoteIpValveWithProxy.java +++ b/test/org/apache/tomcat/integration/httpd/TestRemoteIpValveWithProxy.java @@ -30,19 +30,19 @@ import org.apache.catalina.valves.RemoteIpValve; import org.apache.tomcat.util.buf.ByteChunk; public class TestRemoteIpValveWithProxy extends HttpdIntegrationBaseTest { - private static final String HTTPD_CONFIG = """ - LoadModule proxy_module modules/mod_proxy.so - LoadModule proxy_http_module modules/mod_proxy_http.so - LoadModule headers_module modules/mod_headers.so - ProxyRequests Off - ProxyPreserveHost On - ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - ProxyAddHeaders Off - RequestHeader set X-Forwarded-For 140.211.11.130 - RequestHeader set X-Forwarded-Proto https - RequestHeader set X-Forwarded-Host whoamI.tomcat - """; + private static final String HTTPD_CONFIG = + "LoadModule proxy_module modules/mod_proxy.so\n" + + "LoadModule proxy_http_module modules/mod_proxy_http.so\n" + + "LoadModule headers_module modules/mod_headers.so\n" + + "ProxyRequests Off\n" + + "ProxyPreserveHost On\n" + + "ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}\n"; + + "ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}\n"; + + "ProxyAddHeaders Off\n" + + "RequestHeader set X-Forwarded-For 140.211.11.130\n" + + "RequestHeader set X-Forwarded-Proto https\n" + + "RequestHeader set X-Forwarded-Host whoamI.tomcat" + ; @Override protected List<Valve> getValveConfig() { diff --git a/test/org/apache/tomcat/integration/httpd/TestSSLValveWithProxy01.java b/test/org/apache/tomcat/integration/httpd/TestSSLValveWithProxy01.java index 65e2b883d9..1fae625009 100644 --- a/test/org/apache/tomcat/integration/httpd/TestSSLValveWithProxy01.java +++ b/test/org/apache/tomcat/integration/httpd/TestSSLValveWithProxy01.java @@ -32,27 +32,27 @@ import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.net.TesterSupport; public class TestSSLValveWithProxy01 extends HttpdIntegrationBaseTest { - private static final String HTTPD_CONFIG = """ - LoadModule proxy_module modules/mod_proxy.so - LoadModule proxy_http_module modules/mod_proxy_http.so - LoadModule headers_module modules/mod_headers.so - LoadModule ssl_module modules/mod_ssl.so - SSLSessionCache none - Listen %{HTTPD_SSL_PORT} https - <VirtualHost *:%{HTTPD_SSL_PORT}> - ServerName localhost:%{HTTPD_SSL_PORT} - SSLEngine on - SSLCertificateFile "%{SSL_CERT_FILE}" - SSLCertificateKeyFile "%{SSL_KEY_FILE}" - ProxyRequests Off - ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - RequestHeader set SSL_CLIENT_CERT "%{SSL_CLIENT_CERT}s" - RequestHeader set SSL_CIPHER "%{SSL_CIPHER}s" - RequestHeader set SSL_SESSION_ID "%{SSL_SESSION_ID}s" - RequestHeader set SSL_CIPHER_USEKEYSIZE "%{SSL_CIPHER_USEKEYSIZE}s" - </VirtualHost> - """; + private static final String HTTPD_CONFIG = + "LoadModule proxy_module modules/mod_proxy.so\n" + + "LoadModule proxy_http_module modules/mod_proxy_http.so\n" + + "LoadModule headers_module modules/mod_headers.so\n" + + "LoadModule ssl_module modules/mod_ssl.so\n" + + "SSLSessionCache none\n" + + "Listen %{HTTPD_SSL_PORT} https\n" + + "<VirtualHost *:%{HTTPD_SSL_PORT}>\n" + + "ServerName localhost:%{HTTPD_SSL_PORT}\n" + + "SSLEngine on\n" + + "SSLCertificateFile \"%{SSL_CERT_FILE}\"\n" + + "SSLCertificateKeyFile \"%{SSL_KEY_FILE}\"\n" + + "ProxyRequests Off\n" + + "ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}\n"; + + "ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}\n"; + + "RequestHeader set SSL_CLIENT_CERT \"%{SSL_CLIENT_CERT}s\"\n" + + "RequestHeader set SSL_CIPHER \"%{SSL_CIPHER}s\"\n" + + "RequestHeader set SSL_SESSION_ID \"%{SSL_SESSION_ID}s\"\n" + + "RequestHeader set SSL_CIPHER_USEKEYSIZE \"%{SSL_CIPHER_USEKEYSIZE}s\"\n" + + "</VirtualHost>" + ; @Override protected List<Valve> getValveConfig() { diff --git a/test/org/apache/tomcat/integration/httpd/TestSSLValveWithProxy02.java b/test/org/apache/tomcat/integration/httpd/TestSSLValveWithProxy02.java index b1ee23803f..2385d04278 100644 --- a/test/org/apache/tomcat/integration/httpd/TestSSLValveWithProxy02.java +++ b/test/org/apache/tomcat/integration/httpd/TestSSLValveWithProxy02.java @@ -32,30 +32,30 @@ import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.net.TesterSupport; public class TestSSLValveWithProxy02 extends HttpdIntegrationBaseTest { - private static final String HTTPD_CONFIG = """ - LoadModule proxy_module modules/mod_proxy.so - LoadModule proxy_http_module modules/mod_proxy_http.so - LoadModule headers_module modules/mod_headers.so - LoadModule ssl_module modules/mod_ssl.so - SSLSessionCache none - Listen %{HTTPD_SSL_PORT} https - <VirtualHost *:%{HTTPD_SSL_PORT}> - ServerName localhost:%{HTTPD_SSL_PORT} - SSLEngine on - SSLCertificateFile "%{SSL_CERT_FILE}" - SSLCertificateKeyFile "%{SSL_KEY_FILE}" - ProxyRequests Off - ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - RequestHeader set SSL_CLIENT_CERT "%{SSL_CLIENT_CERT}s" - RequestHeader set SSL_CIPHER "%{SSL_CIPHER}s" - RequestHeader set SSL_SESSION_ID "%{SSL_SESSION_ID}s" - RequestHeader set SSL_CIPHER_USEKEYSIZE "%{SSL_CIPHER_USEKEYSIZE}s" - SSLVerifyClient optional - SSLCACertificateFile "%{SSL_CA_CERT_FILE}" - SSLOptions +ExportCertData - </VirtualHost> - """; + private static final String HTTPD_CONFIG = + "LoadModule proxy_module modules/mod_proxy.so\n" + + "LoadModule proxy_http_module modules/mod_proxy_http.so\n" + + "LoadModule headers_module modules/mod_headers.so\n" + + "LoadModule ssl_module modules/mod_ssl.so\n" + + "SSLSessionCache none\n" + + "Listen %{HTTPD_SSL_PORT} https\n" + + "<VirtualHost *:%{HTTPD_SSL_PORT}>\n" + + "ServerName localhost:%{HTTPD_SSL_PORT}\n" + + "SSLEngine on\n" + + "SSLCertificateFile \"%{SSL_CERT_FILE}\"\n" + + "SSLCertificateKeyFile \"%{SSL_KEY_FILE}\"\n" + + "ProxyRequests Off\n" + + "ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}\n"; + + "ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}\n"; + + "RequestHeader set SSL_CLIENT_CERT \"%{SSL_CLIENT_CERT}s\"\n" + + "RequestHeader set SSL_CIPHER \"%{SSL_CIPHER}s\"\n" + + "RequestHeader set SSL_SESSION_ID \"%{SSL_SESSION_ID}s\"\n" + + "RequestHeader set SSL_CIPHER_USEKEYSIZE \"%{SSL_CIPHER_USEKEYSIZE}s\"\n" + + "SSLVerifyClient optional\n" + + "SSLCACertificateFile \"%{SSL_CA_CERT_FILE}\"\n" + + "SSLOptions +ExportCertData\n" + + "</VirtualHost>" + ; @Override protected List<Valve> getValveConfig() { diff --git a/test/org/apache/tomcat/integration/httpd/TestSessionWithProxy.java b/test/org/apache/tomcat/integration/httpd/TestSessionWithProxy.java index 105bd14680..aa6b80d53f 100644 --- a/test/org/apache/tomcat/integration/httpd/TestSessionWithProxy.java +++ b/test/org/apache/tomcat/integration/httpd/TestSessionWithProxy.java @@ -33,25 +33,25 @@ import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.net.TesterSupport; public class TestSessionWithProxy extends HttpdIntegrationBaseTest { - private static final String HTTPD_CONFIG = """ - LoadModule proxy_module modules/mod_proxy.so - LoadModule proxy_http_module modules/mod_proxy_http.so - LoadModule headers_module modules/mod_headers.so - LoadModule ssl_module modules/mod_ssl.so - SSLSessionCache none - ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - Listen %{HTTPD_SSL_PORT} https - <VirtualHost *:%{HTTPD_SSL_PORT}> - ServerName localhost:%{HTTPD_SSL_PORT} - SSLEngine on - SSLCertificateFile "%{SSL_CERT_FILE}" - SSLCertificateKeyFile "%{SSL_KEY_FILE}" - ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME} - RequestHeader set X-Forwarded-Proto https - </VirtualHost> - """; + private static final String HTTPD_CONFIG = + "LoadModule proxy_module modules/mod_proxy.so\n" + + "LoadModule proxy_http_module modules/mod_proxy_http.so\n" + + "LoadModule headers_module modules/mod_headers.so\n" + + "LoadModule ssl_module modules/mod_ssl.so\n" + + "SSLSessionCache none\n" + + "ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}\n"; + + "ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}\n"; + + "Listen %{HTTPD_SSL_PORT} https\n" + + "<VirtualHost *:%{HTTPD_SSL_PORT}>\n" + + "ServerName localhost:%{HTTPD_SSL_PORT}\n" + + "SSLEngine on\n" + + "SSLCertificateFile \"%{SSL_CERT_FILE}\"\n" + + "SSLCertificateKeyFile \"%{SSL_KEY_FILE}\"\n" + + "ProxyPass /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}\n"; + + "ProxyPassReverse /endpoint http://localhost:%{TOMCAT_PORT}/%{SERVLET_NAME}\n"; + + "RequestHeader set X-Forwarded-Proto https\n" + + "</VirtualHost>" + ; @Override protected List<Valve> getValveConfig() { diff --git a/test/org/apache/tomcat/integration/httpd/TesterHttpd.java b/test/org/apache/tomcat/integration/httpd/TesterHttpd.java index 691dd428cd..d6e4a22aa7 100644 --- a/test/org/apache/tomcat/integration/httpd/TesterHttpd.java +++ b/test/org/apache/tomcat/integration/httpd/TesterHttpd.java @@ -17,8 +17,10 @@ package org.apache.tomcat.integration.httpd; +import java.io.BufferedReader; import java.io.File; import java.io.IOException; +import java.io.InputStreamReader; import java.io.PrintStream; import java.io.Reader; import java.net.Socket; @@ -70,8 +72,8 @@ public class TesterHttpd { p = pb.start(); - redirect(p.inputReader(), System.out, swallowOutput); - redirect(p.errorReader(), System.err, swallowOutput); + redirect(new BufferedReader(new InputStreamReader(p.getInputStream())), System.out, swallowOutput); + redirect(new BufferedReader(new InputStreamReader(p.getErrorStream())), System.err, swallowOutput); Assert.assertTrue(p.isAlive() && isHttpdReady()); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
