(tomcat) branch 9.0.x updated: Another instance of user agent matching

[email protected] Fri, 31 Jul 2026 12:04:00 +0000
Newsgroups gmane.comp.jakarta.tomcat.devel
Message-ID <178549944076.4117747.11544284258409514963@gitbox3-he-fi.apache.org>
This is an automated email from the ASF dual-hosted git repository.

rmaucher pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new f482127257 Another instance of user agent matching
f482127257 is described below

commit f482127257feb04693b0201007c8cc5424395b76
Author: remm <[email protected]>
AuthorDate: Fri Jul 31 14:01:15 2026 +0200

    Another instance of user agent matching
---
 java/org/apache/catalina/valves/CrawlerSessionManagerValve.java | 2 +-
 webapps/docs/changelog.xml                                      | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index 856a6e9131..277b59753a 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -248,7 +248,7 @@ public class CrawlerSessionManagerValve extends ValveBase {
                     log.trace(request.hashCode() + ": UserAgent=" + uaHeader);
                 }
 
-                if (uaPattern != null && uaPattern.matcher(uaHeader).matches()) {
+                if (uaPattern != null && uaPattern.matcher(uaHeader).find()) {
                     isBot = true;
 
                     if (log.isTraceEnabled()) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a3cf7eb9d5..1429f6f05b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -167,6 +167,13 @@
         attribute is not available or not configured for the current user.
         (markt)
       </fix>
+      <fix>
+        Fix matching the crawler user-agents of
+        <code>CrawlerSessionManagerValve</code> with patterns of the style
+        of the default
+        <code>.*[bB]ot.*|.*Yahoo! Slurp.*|.*Feedfetcher-Google.*</code>
+        pattern and documentation. (remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">