This is an automated email from the ASF dual-hosted git repository.
markt 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 dc039f4fd0 More refactoring to reduce duplication
dc039f4fd0 is described below
commit dc039f4fd0bec37abb18e2508424e14ad253275a
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Apr 9 08:23:36 2026 +0100
More refactoring to reduce duplication
---
.../apache/catalina/valves/AbstractAccessLogValve.java | 13 ++++++++-----
.../apache/catalina/valves/ExtendedAccessLogValve.java | 18 ++----------------
2 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index e3c3358995..afb2c2ad63 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -1325,7 +1325,7 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
buf.append(request.getMethod());
buf.append(' ');
escapeAndAppend(request.getRequestURI(), buf);
- appendQueryString(request.getQueryString(), buf, false);
+ appendQueryString(request.getQueryString(), buf, true,
false, false);
buf.append(' ');
buf.append(request.getProtocol());
}
@@ -1637,16 +1637,19 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
if (request != null) {
query = request.getQueryString();
}
- appendQueryString(query, buf, true);
+ appendQueryString(query, buf, true, false, true);
}
}
- protected static void appendQueryString(String query, CharArrayWriter buf,
boolean writeDashOnNull) {
+ protected static void appendQueryString(String query, CharArrayWriter buf,
+ boolean appendDelim, boolean escapeQuoteAsDouble, boolean
writeDashOnNull) {
if (query != null) {
- buf.append('?');
+ if (appendDelim) {
+ buf.append('?');
+ }
// Don't want to write "-" if the query string is empty
if (!query.isEmpty()) {
- escapeAndAppend(query, buf);
+ escapeAndAppend(query, buf, escapeQuoteAsDouble);
}
} else if (writeDashOnNull) {
buf.append('-');
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index 682d4c2557..416000e7cd 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -597,28 +597,14 @@ public class ExtendedAccessLogValve extends
AccessLogValve {
if (request != null) {
query = request.getQueryString();
}
- if (query == null) {
- buf.append('-');
- } else if (query.isEmpty()) {
- // NO-OP
- // Don't want to write "-" if the query string
is present but empty
- } else {
- escapeAndAppend(query, buf, true);
- }
+ appendQueryString(query, buf, false, true, true);
};
}
} else {
return (buf, request, res, l) -> {
if (request != null) {
escapeAndAppend(request.getRequestURI(), buf);
- String query = request.getQueryString();
- if (query != null) {
- buf.append('?');
- // Don't want to write "-" if the query string
is present but empty
- if (!query.isEmpty()) {
- buf.append(query);
- }
- }
+ appendQueryString(request.getQueryString(), buf,
true, true, false);
} else {
buf.append('-');
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
