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:09:26 UTC
svn commit: r106200 - /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java /cocoon/branches/BRANCH_2_1_X/status.xml
Author: bruno
Date: Mon Nov 22 09:09:25 2004
New Revision: 106200
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java
cocoon/branches/BRANCH_2_1_X/status.xml
Log:
Sync from trunk:
To have consistent encoding-behaviour between normal requests and
multipart requests, the container encoding should be used for decoding
the multipart request.
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java?view=diff&rev=106200&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java&r1=106199&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java&r2=106200
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java Mon Nov 22 09:09:25 2004
@@ -474,7 +474,7 @@
this.allowOverwrite,
this.silentlyRename,
this.maxUploadSize,
- this.defaultFormEncoding);
+ this.containerEncoding);
// Add the servlet configuration
this.appContext.put(CONTEXT_SERVLET_CONFIG, conf);
this.createCocoon();
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?view=diff&rev=106200&p1=cocoon/branches/BRANCH_2_1_X/status.xml&r1=106199&p2=cocoon/branches/BRANCH_2_1_X/status.xml&r2=106200
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Mon Nov 22 09:09:25 2004
@@ -202,6 +202,10 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="BRD" type="fix">
+ Multipart requests: use container encoding for decoding requests, in order to have consistent
+ handling between normal requests and multipart requests.
+ </action>
<action dev="BRD" type="fix" due-to="Neil Bacon" fixes-bug="31887" due-to-email="nbacon@pinnaclesoftware.com.au">
I18n (ParamSaxBuffer): handle case where substitution params like {0} are split over multiple character events.
</action>