amyroh 2002/09/09 20:31:16 Modified: catalina/src/share/org/apache/catalina/servlets ManagerServlet.java HTMLManagerServlet.java Log: Fix the output character encoding of servlet response to be specified in accordance with the default locale of the server. Fix for Bugzilla 10910. Patch submitted by Kan Ogawa <[EMAIL PROTECTED]>. Revision Changes Path 1.26 +9 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java Index: ManagerServlet.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- ManagerServlet.java 29 Aug 2002 14:01:19 -0000 1.25 +++ ManagerServlet.java 10 Sep 2002 03:31:16 -0000 1.26 @@ -74,6 +74,7 @@ import java.net.URL; import java.util.Enumeration; import java.util.Iterator; +import java.util.Locale; import java.util.jar.JarEntry; import java.util.jar.JarFile; import javax.naming.Binding; @@ -330,6 +331,8 @@ // Prepare our output writer to generate the response message response.setContentType("text/plain"); + Locale locale = Locale.getDefault(); + response.setLocale(locale); PrintWriter writer = response.getWriter(); // Process the requested command (note - "/deploy" is not listed here) @@ -393,6 +396,8 @@ // Prepare our output writer to generate the response message response.setContentType("text/plain"); + Locale locale = Locale.getDefault(); + response.setLocale(locale); PrintWriter writer = response.getWriter(); // Process the requested command 1.10 +7 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java Index: HTMLManagerServlet.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- HTMLManagerServlet.java 29 Aug 2002 14:01:19 -0000 1.9 +++ HTMLManagerServlet.java 10 Sep 2002 03:31:16 -0000 1.10 @@ -70,6 +70,7 @@ import java.text.MessageFormat; import java.util.Date; import java.util.Iterator; +import java.util.Locale; import java.util.Map; import java.util.TreeMap; import javax.servlet.ServletException; @@ -127,6 +128,8 @@ // Prepare our output writer to generate the response message response.setContentType("text/html"); + Locale locale = Locale.getDefault(); + response.setLocale(locale); PrintWriter writer = response.getWriter(); // Process the requested command
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>