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 221d7f1eab Add jakarta to the reserved prefixes for SSI
221d7f1eab is described below
commit 221d7f1eabb4fa5fe7085d1c92e79e030cb1a005
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Jun 10 11:45:19 2026 +0100
Add jakarta to the reserved prefixes for SSI
---
java/org/apache/catalina/ssi/SSIServletExternalResolver.java | 5 +++--
webapps/docs/changelog.xml | 4 ++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
b/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
index 1f0e25c7a1..d98ef56295 100644
--- a/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
+++ b/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
@@ -174,14 +174,15 @@ public class SSIServletExternalResolver implements
SSIExternalResolver {
/**
- * Check if a name is reserved (java., javax., sun. prefixes).
+ * Check if a name is reserved (java., javax., sun. & jakarta. prefixes).
*
* @param name the name to check
*
* @return true if the name is reserved
*/
protected boolean isNameReserved(String name) {
- return name.startsWith("java.") || name.startsWith("javax.") ||
name.startsWith("sun.");
+ return name.startsWith("java.") || name.startsWith("javax.") ||
name.startsWith("sun.") ||
+ name.startsWith("jakarta.");
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b49aaf5d55..3acc836d7e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -378,6 +378,10 @@
<fix>
Fix a potential deadlock when copying resources using WebDAV. (markt)
</fix>
+ <fix>
+ Add <code>jakarta.</code> to the list of reserved prefixes for SSI
+ variables and request attributes. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
