(tomcat) branch 9.0.x updated: Fix back-port
| Newsgroups | gmane.comp.jakarta.tomcat.devel |
|---|---|
| Message-ID | <178645526005.2141786.17850495804951250666@gitbox3-he-fi.apache.org> |
This is an automated email from the ASF dual-hosted git repository.
markt-asf 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 d6f2a7de5e Fix back-port
d6f2a7de5e is described below
commit d6f2a7de5ec290b9158f3af8e5192c364888ae2d
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Aug 11 14:32:13 2026 +0100
Fix back-port
---
.../catalina/authenticator/TestFormAuthenticatorD.java | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/test/org/apache/catalina/authenticator/TestFormAuthenticatorD.java b/test/org/apache/catalina/authenticator/TestFormAuthenticatorD.java
index cdc9d6977c..8c690069c7 100644
--- a/test/org/apache/catalina/authenticator/TestFormAuthenticatorD.java
+++ b/test/org/apache/catalina/authenticator/TestFormAuthenticatorD.java
@@ -18,12 +18,11 @@ package org.apache.catalina.authenticator;
import java.io.IOException;
import java.io.PrintWriter;
-import java.nio.charset.StandardCharsets;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.junit.Assert;
import org.junit.Test;
@@ -263,7 +262,7 @@ public class TestFormAuthenticatorD extends TomcatBaseTest {
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
resp.setContentType("text/html");
- resp.setCharacterEncoding(StandardCharsets.UTF_8);
+ resp.setCharacterEncoding("UTF-8");
PrintWriter pw = resp.getWriter();
pw.println("<html>");
pw.println("<body>");
@@ -285,7 +284,7 @@ public class TestFormAuthenticatorD extends TomcatBaseTest {
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
resp.setContentType("text/plain");
- resp.setCharacterEncoding(StandardCharsets.UTF_8);
+ resp.setCharacterEncoding("UTF-8");
PrintWriter pw = resp.getWriter();
pw.println("Login failed");
}
@@ -299,7 +298,7 @@ public class TestFormAuthenticatorD extends TomcatBaseTest {
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
resp.setContentType("text/plain");
- resp.setCharacterEncoding(StandardCharsets.UTF_8);
+ resp.setCharacterEncoding("UTF-8");
PrintWriter pw = resp.getWriter();
pw.println(req.getMethod());
pw.println(req.getRemoteUser());