You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by br...@apache.org on 2004/11/22 18:08:41 UTC

svn commit: r106199 - /cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml

Author: bruno
Date: Mon Nov 22 09:08:40 2004
New Revision: 106199

Modified:
   cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml
Log:
Sync from trunk:
Uncomment the container-encoding and form-encoding parameters, this
makes no difference as they otherwise also default to ISO-8859-1.
This makes it easier to replace them using xpatch.
Add some clarification to the often-confused container-encoding.


Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml?view=diff&rev=106199&p1=cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml&r1=106198&p2=cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml&r2=106199
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml	Mon Nov 22 09:08:40 2004
@@ -341,24 +341,23 @@
     <!--
       Set encoding used by the container. If not set the ISO-8859-1 encoding
       will be assumed.
+      Since the servlet specification requires that the ISO-8859-1 encoding
+      is used (by default), you should never change this value unless
+      you have a buggy servlet container.
     -->
-    <!--
     <init-param>
       <param-name>container-encoding</param-name>
-      <param-value>utf-8</param-value>
+      <param-value>ISO-8859-1</param-value>
     </init-param>
-    -->
 
     <!--
       Set form encoding. This will be the character set used to decode request
       parameters. If not set the ISO-8859-1 encoding will be assumed.
     -->
-    <!--
     <init-param>
       <param-name>form-encoding</param-name>
-      <param-value>utf-8</param-value>
+      <param-value>ISO-8859-1</param-value>
     </init-param>
-    -->
 
     <!--
       This parameter allows you to startup Cocoon2 immediately after startup