Author: dkulp
Date: Fri Jul 18 12:48:33 2008
New Revision: 678016
URL: http://svn.apache.org/viewvc?rev=678016&view=rev
Log:
Merged revisions 678004 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r678004 | dkulp | 2008-07-18 15:22:17 -0400 (Fri, 18 Jul 2008) | 2 lines
[CXF-1705] Servlet 2.3 compliance (Patch from Hani Suleiman applied)
........
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 18 12:48:33 2008
@@ -1 +1 @@
-/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385
+/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=678016&r1=678015&r2=678016&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
(original)
+++
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
Fri Jul 18 12:48:33 2008
@@ -193,8 +193,7 @@
return;
}
- response.setContentType("text/html");
- response.setCharacterEncoding("UTF-8");
+ response.setContentType("text/html; charset=UTF-8");
response.getWriter().write("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML
4.01 Transitional//EN\" "
+ "\"http://www.w3.org/TR/html4/loose.dtd\";>");
