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 c92381eaa8 Update docs and Javadoc for SSI reserved names
c92381eaa8 is described below
commit c92381eaa8d2a17ba94090705a569932d56b5eb6
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jun 16 12:29:55 2026 +0100
Update docs and Javadoc for SSI reserved names
---
java/org/apache/catalina/ssi/SSIServletExternalResolver.java | 4 ++--
webapps/docs/ssi-howto.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
b/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
index 16c1cce110..875c96c551 100644
--- a/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
+++ b/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
@@ -175,8 +175,8 @@ public class SSIServletExternalResolver implements
SSIExternalResolver {
/**
- * Check if a name is reserved ({@code java.}, {@code javax.}, {@code
sun.}, {@code jakarta.} and
- * {@code org.apache.tomcat.} prefixes).
+ * Check if a name is reserved ({@code java.}, {@code javax.}, {@code
sun.}, {@code jakarta.},
+ * {@code org.apache.catalina.} and {@code org.apache.tomcat.} prefixes).
*
* @param name the name to check
*
diff --git a/webapps/docs/ssi-howto.xml b/webapps/docs/ssi-howto.xml
index 16d84b68a0..899a807f0f 100644
--- a/webapps/docs/ssi-howto.xml
+++ b/webapps/docs/ssi-howto.xml
@@ -233,7 +233,7 @@ Apache Introduction to SSI</a> for more information on
using SSI directives.</p>
<p>
SSI variables are implemented via request attributes on the
<b>jakarta.servlet.ServletRequest</b> object
and are not limited to the SSI servlet. Variables starting with the names
-"java.", "javax.", "sun" or "org.apache.catalina.ssi.SSIMediator." are reserved
+"java.", "javax.", "sun.", "jakarta.", "org.apache.catalina." or
"org.apache.tomcat." are reserved
and cannot be used.
</p>
<p>The SSI servlet currently implements the following variables:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
