This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new f6ad97d67a %{SSL:HTTPS} should return either on or off
f6ad97d67a is described below
commit f6ad97d67a839c43814abf880ff9dfb5f044442b
Author: Mark Thomas <[email protected]>
AuthorDate: Thu May 28 17:26:37 2026 +0100
%{SSL:HTTPS} should return either on or off
---
java/org/apache/catalina/valves/rewrite/ResolverImpl.java | 4 +++-
webapps/docs/changelog.xml | 5 +++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
index 0f7a5f5492..d2724f96cb 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -195,7 +195,7 @@ public class ResolverImpl extends Resolver {
// SSL_SRP_USER: no planned support for SRP
// SSL_SRP_USERINFO: no planned support for SRP
if (key.equals("HTTPS")) {
- return String.valueOf(sslSupport != null);
+ return "on";
} else if (key.equals("SSL_PROTOCOL")) {
return sslSupport.getProtocol();
} else if (key.equals("SSL_SESSION_ID")) {
@@ -273,6 +273,8 @@ public class ResolverImpl extends Resolver {
containerLog.debug(sm.getString("resolverImpl.tlsError"),
ioe);
}
}
+ } else if (key.equals("HTTPS")) {
+ return "off";
}
return null;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5404e04d0f..e1acfe5e58 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -214,6 +214,11 @@
<fix>
Fix connection leak in <code>ProxyErrorReportValve</code>. (remm)
</fix>
+ <fix>
+ When using the <code>RewriteValve</code>, <code>%{SSL:HTTPS}</code> now
+ returns <code>on</code> or <code>off</code> rather than
+ <code>true</code> or <code>false</code> to align with httpd. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
