This is an automated email from the ASF dual-hosted git repository.
markt 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 f830b9f96c Make comments consistent. Add changelog entry.
f830b9f96c is described below
commit f830b9f96cc7ae35bf6c57aeb91e512cbc45842a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 4 15:45:53 2025 +0100
Make comments consistent. Add changelog entry.
---
.../org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java | 2 +-
webapps/docs/changelog.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git
a/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
b/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
index 2b6ccce5f9..2f62721bc6 100644
--- a/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
+++ b/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
@@ -53,7 +53,7 @@ public class RandomizedTextRewriteMap implements RewriteMap {
// Ignore comment line or empty lines
continue;
} else if (line.indexOf('#') > 0) {
- // comment characters after '#'
+ // Ignore comment characters after '#'
line = line.substring(0, line.indexOf('#')).trim();
}
String[] keyValuePair = line.split(" ", 2);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 42781609d8..479f49b7cf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -126,6 +126,11 @@
the session id if appropriate, and handle cross context with different
session configuration when using rewrite. (remm)
</fix>
+ <add>
+ <pr>863</pr>: Add support for comments at the end of lines in text
+ rewrite map files to align behaviour with Apache httpd. Pull request
+ provided by Chenjp. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
