Mark, Thanks for back-porting this. I thought I had already done so.
-chris On 4/26/24 12:58, ma...@apache.org wrote:
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 783815fd94 Fix disastrous cookie-logging patch. 783815fd94 is described below commit 783815fd940a4ac2f6d7df7bd056e071f54d7de6 Author: Christopher Schultz <ch...@christopherschultz.net> AuthorDate: Fri Apr 19 10:16:36 2024 -0400 Fix disastrous cookie-logging patch. --- java/org/apache/catalina/valves/AbstractAccessLogValve.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java b/java/org/apache/catalina/valves/AbstractAccessLogValve.java index 03acb492fa..5c4e67dde6 100644 --- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java +++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java @@ -1515,17 +1515,19 @@ public abstract class AbstractAccessLogValve extends ValveBase implements Access if (cookies != null) { for (Cookie cookie : cookies) { if (cookieNameToLog.equals(cookie.getName())) { + if (value == null) { + value = new StringBuilder(); + } if (first) { first = false; } else { value.append(','); } - value = new StringBuilder(); value.append(cookie.getValue()); } } } - if (value.length() == 0) { + if (value == null) { buf.append('-'); } else { escapeAndAppend(value.toString(), buf); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
--------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
