Author: kpreisser
Date: Wed Dec 18 02:53:35 2013
New Revision: 1551814
URL: http://svn.apache.org/r1551814
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48550
Follow-Up to r1511468:
Fix example servlets to output text as UTF-8. This fixes encoding issues with
the "Request Parameters" and "Cookies" as otherwise the browser would encode
the form data with the document encoding (ISO-8859-1) but Tomcat will interpret
it as UTF-8.
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java?rev=1551814&r1=1551813&r2=1551814&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java Wed Dec 18
02:53:35 2013
@@ -57,10 +57,12 @@ public class CookieExample extends HttpS
}
response.setContentType("text/html");
+ response.setCharacterEncoding("UTF-8");
PrintWriter out = response.getWriter();
- out.println("<html>");
+ out.println("<!DOCTYPE html><html>");
out.println("<head>");
+ out.println("<meta charset=\"UTF-8\" />");
String title = RB.getString("cookies.title");
out.println("<title>" + title + "</title>");
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java?rev=1551814&r1=1551813&r2=1551814&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java Wed
Dec 18 02:53:35 2013
@@ -41,10 +41,12 @@ public class HelloWorldExample extends H
ResourceBundle rb =
ResourceBundle.getBundle("LocalStrings",request.getLocale());
response.setContentType("text/html");
+ response.setCharacterEncoding("UTF-8");
PrintWriter out = response.getWriter();
- out.println("<html>");
+ out.println("<!DOCTYPE html><html>");
out.println("<head>");
+ out.println("<meta charset=\"UTF-8\" />");
String title = rb.getString("helloworld.title");
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java?rev=1551814&r1=1551813&r2=1551814&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java Wed
Dec 18 02:53:35 2013
@@ -48,10 +48,12 @@ public class RequestHeaderExample extend
throws IOException, ServletException
{
response.setContentType("text/html");
+ response.setCharacterEncoding("UTF-8");
PrintWriter out = response.getWriter();
- out.println("<html>");
+ out.println("<!DOCTYPE html><html>");
out.println("<head>");
+ out.println("<meta charset=\"UTF-8\" />");
String title = RB.getString("requestheader.title");
out.println("<title>" + title + "</title>");
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java?rev=1551814&r1=1551813&r2=1551814&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java Wed
Dec 18 02:53:35 2013
@@ -47,10 +47,12 @@ public class RequestInfoExample extends
throws IOException, ServletException
{
response.setContentType("text/html");
+ response.setCharacterEncoding("UTF-8");
PrintWriter out = response.getWriter();
- out.println("<html>");
+ out.println("<!DOCTYPE html><html>");
out.println("<head>");
+ out.println("<meta charset=\"UTF-8\" />");
String title = RB.getString("requestinfo.title");
out.println("<title>" + title + "</title>");
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java?rev=1551814&r1=1551813&r2=1551814&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java Wed
Dec 18 02:53:35 2013
@@ -47,10 +47,12 @@ public class RequestParamExample extends
throws IOException, ServletException
{
response.setContentType("text/html");
+ response.setCharacterEncoding("UTF-8");
PrintWriter out = response.getWriter();
- out.println("<html>");
+ out.println("<!DOCTYPE html><html>");
out.println("<head>");
+ out.println("<meta charset=\"UTF-8\" />");
String title = RB.getString("requestparams.title");
out.println("<title>" + title + "</title>");
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java?rev=1551814&r1=1551813&r2=1551814&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java Wed Dec
18 02:53:35 2013
@@ -49,11 +49,14 @@ public class SessionExample extends Http
HttpServletResponse response)
throws IOException, ServletException
{
- response.setContentType("text/html;charset=UTF-8");
+ response.setContentType("text/html");
+ response.setCharacterEncoding("UTF-8");
PrintWriter out = response.getWriter();
- out.println("<html>");
+ out.println("<!DOCTYPE html><html>");
out.println("<head>");
+ out.println("<meta charset=\"UTF-8\" />");
+
String title = RB.getString("sessions.title");
out.println("<title>" + title + "</title>");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
