svn commit: r706805 - in /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet: GadgetRenderingServlet.java MakeRequestHandler.java

[etnu]

Author: etnu
Date: Tue Oct 21 15:51:15 2008
New Revision: 706805

URL: http://svn.apache.org/viewvc?rev=706805&view=rev
Log:
Ensured proper output encoding for all responses.


Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java?rev=706805&r1=706804&r2=706805&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
 Tue Oct 21 15:51:15 2008
@@ -51,6 +51,9 @@
       return;
     }
 
+    resp.setContentType("text/html");
+    resp.setCharacterEncoding("UTF-8");
+
     GadgetContext context = new HttpGadgetContext(req);
     RenderingResults results = renderer.render(context);
     switch (results.getStatus()) {
@@ -65,7 +68,6 @@
           // TODO: This should be configurable
           HttpUtil.setCachingHeaders(resp, DEFAULT_CACHE_TTL, true);
         }
-        resp.setHeader("Content-Type", "text/html; charset=utf-8");
         resp.getWriter().print(results.getContent());
         break;
       case ERROR:

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java?rev=706805&r1=706804&r2=706805&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
 Tue Oct 21 15:51:15 2008
@@ -95,7 +95,8 @@
     setResponseHeaders(request, response, results);
 
     response.setStatus(HttpServletResponse.SC_OK);
-    response.setContentType("application/json; charset=utf-8");
+    response.setContentType("application/json");
+    response.setCharacterEncoding("UTF-8");
     response.getWriter().write(UNPARSEABLE_CRUFT + output);
   }