[tomcat] branch main updated: Fix BZ 66393 - Align ExtendedAccessLogValve's x-P(XXX) with the documentation.
This is an automated email from the ASF dual-hosted git repository.
lihan 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 6a5ef86802 Fix BZ 66393 - Align ExtendedAccessLogValve's x-P(XXX) with
the documentation.
6a5ef86802 is described below
commit 6a5ef86802883a34f7e24865d0d37158d50d9b9c
Author: lihan
AuthorDate: Tue Dec 20 18:21:56 2022 +0800
Fix BZ 66393 - Align ExtendedAccessLogValve's x-P(XXX) with the
documentation.
https://bz.apache.org/bugzilla/show_bug.cgi?id=66393
---
java/org/apache/catalina/valves/ExtendedAccessLogValve.java | 11 +++
webapps/docs/changelog.xml | 4
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index 852a473c43..f9e97dda18 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -19,9 +19,8 @@ package org.apache.catalina.valves;
import java.io.CharArrayWriter;
import java.io.IOException;
import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
import java.net.InetAddress;
-import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -36,6 +35,7 @@ import jakarta.servlet.http.HttpSession;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.ServerInfo;
+import org.apache.catalina.util.URLEncoder;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -399,12 +399,7 @@ public class ExtendedAccessLogValve extends AccessLogValve
{
if (null==value || value.length()==0) {
return null;
}
-try {
-return URLEncoder.encode(value, "UTF-8");
-} catch (UnsupportedEncodingException e) {
-// Should never happen - all JVMs are required to support UTF-8
-return null;
-}
+return URLEncoder.QUERY.encode(value, StandardCharsets.UTF_8);
}
@Override
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6475f10adb..db6edb18cf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,10 @@
66392: Change the default value of
AccessLogValue's
file encoding to UTF-8 and update documentation. (lihan)
+
+66393: Align ExtendedAccessLogValve's x-P(XXX)
with the
+documentation. (lihan)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Fix BZ 66393 - Align ExtendedAccessLogValve's x-P(XXX) with the documentation.
This is an automated email from the ASF dual-hosted git repository.
lihan 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 f065cf0118 Fix BZ 66393 - Align ExtendedAccessLogValve's x-P(XXX) with
the documentation.
f065cf0118 is described below
commit f065cf0118ba4d88d493143a646c81d2991ee7a3
Author: lihan
AuthorDate: Tue Dec 20 18:21:56 2022 +0800
Fix BZ 66393 - Align ExtendedAccessLogValve's x-P(XXX) with the
documentation.
https://bz.apache.org/bugzilla/show_bug.cgi?id=66393
---
java/org/apache/catalina/valves/ExtendedAccessLogValve.java | 11 +++
webapps/docs/changelog.xml | 4
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index 852a473c43..f9e97dda18 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -19,9 +19,8 @@ package org.apache.catalina.valves;
import java.io.CharArrayWriter;
import java.io.IOException;
import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
import java.net.InetAddress;
-import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -36,6 +35,7 @@ import jakarta.servlet.http.HttpSession;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.ServerInfo;
+import org.apache.catalina.util.URLEncoder;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -399,12 +399,7 @@ public class ExtendedAccessLogValve extends AccessLogValve
{
if (null==value || value.length()==0) {
return null;
}
-try {
-return URLEncoder.encode(value, "UTF-8");
-} catch (UnsupportedEncodingException e) {
-// Should never happen - all JVMs are required to support UTF-8
-return null;
-}
+return URLEncoder.QUERY.encode(value, StandardCharsets.UTF_8);
}
@Override
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c5b55fc943..3cb080349f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -117,6 +117,10 @@
66392: Change the default value of
AccessLogValue's
file encoding to UTF-8 and update documentation. (lihan)
+
+66393: Align ExtendedAccessLogValve's x-P(XXX)
with the
+documentation. (lihan)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix BZ 66393 - Align ExtendedAccessLogValve's x-P(XXX) with the documentation.
This is an automated email from the ASF dual-hosted git repository.
lihan 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 0dead5d52d Fix BZ 66393 - Align ExtendedAccessLogValve's x-P(XXX) with
the documentation.
0dead5d52d is described below
commit 0dead5d52d50832d1295f6fa6efab4b237bff865
Author: lihan
AuthorDate: Tue Dec 20 18:21:56 2022 +0800
Fix BZ 66393 - Align ExtendedAccessLogValve's x-P(XXX) with the
documentation.
https://bz.apache.org/bugzilla/show_bug.cgi?id=66393
---
java/org/apache/catalina/valves/ExtendedAccessLogValve.java | 11 +++
webapps/docs/changelog.xml | 4
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index a128d236b6..37b3e865b9 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -19,9 +19,8 @@ package org.apache.catalina.valves;
import java.io.CharArrayWriter;
import java.io.IOException;
import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
import java.net.InetAddress;
-import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -36,6 +35,7 @@ import javax.servlet.http.HttpSession;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.ServerInfo;
+import org.apache.catalina.util.URLEncoder;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -399,12 +399,7 @@ public class ExtendedAccessLogValve extends AccessLogValve
{
if (null==value || value.length()==0) {
return null;
}
-try {
-return URLEncoder.encode(value, "UTF-8");
-} catch (UnsupportedEncodingException e) {
-// Should never happen - all JVMs are required to support UTF-8
-return null;
-}
+return URLEncoder.QUERY.encode(value, StandardCharsets.UTF_8);
}
@Override
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 07a669dd99..d49628ba7c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -117,6 +117,10 @@
66392: Change the default value of
AccessLogValue's
file encoding to UTF-8 and update documentation. (lihan)
+
+66393: Align ExtendedAccessLogValve's x-P(XXX)
with the
+documentation. (lihan)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix BZ 66393 - Align ExtendedAccessLogValve's x-P(XXX) with the documentation.
This is an automated email from the ASF dual-hosted git repository.
lihan pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 5febdec1be Fix BZ 66393 - Align ExtendedAccessLogValve's x-P(XXX) with
the documentation.
5febdec1be is described below
commit 5febdec1bedc9f4b431dc42420a094cd4bcd9827
Author: lihan
AuthorDate: Tue Dec 20 18:21:56 2022 +0800
Fix BZ 66393 - Align ExtendedAccessLogValve's x-P(XXX) with the
documentation.
https://bz.apache.org/bugzilla/show_bug.cgi?id=66393
---
java/org/apache/catalina/valves/ExtendedAccessLogValve.java | 11 +++
webapps/docs/changelog.xml | 4
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index f4313ac9ac..a5a79482e4 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -19,9 +19,8 @@ package org.apache.catalina.valves;
import java.io.CharArrayWriter;
import java.io.IOException;
import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
import java.net.InetAddress;
-import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -36,6 +35,7 @@ import javax.servlet.http.HttpSession;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.ServerInfo;
+import org.apache.catalina.util.URLEncoder;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -409,12 +409,7 @@ public class ExtendedAccessLogValve extends AccessLogValve
{
if (null==value || value.length()==0) {
return null;
}
-try {
-return URLEncoder.encode(value, "UTF-8");
-} catch (UnsupportedEncodingException e) {
-// Should never happen - all JVMs are required to support UTF-8
-return null;
-}
+return URLEncoder.QUERY.encode(value, StandardCharsets.UTF_8);
}
@Override
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 674d599cdc..963a150476 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,10 @@
66392: Change the default value of
AccessLogValue's
file encoding to UTF-8 and update documentation. (lihan)
+
+66393: Align ExtendedAccessLogValve's x-P(XXX)
with the
+documentation. (lihan)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66393] ExtendedAccessLogValve's x-P(XXX) does not correspond to the documentation
https://bz.apache.org/bugzilla/show_bug.cgi?id=66393 Han Li changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #1 from Han Li --- Fixed in: - 11.0.x for 11.0.0-M2 onwards - 10.1.x for 10.1.5 onwards - 9.0.x for 9.0.71 onwards - 8.5.x for 8.5.85 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
