svn commit: r1660033 - in /ofbiz/branches/release14.12: ./ framework/base/src/org/ofbiz/base/util/UtilCodec.java

[jacopoc]

Author: jacopoc
Date: Mon Feb 16 07:11:19 2015
New Revision: 1660033

URL: http://svn.apache.org/r1660033
Log:
Applied fix from trunk for revision: 1659224
===

Relaxing default behavior of canonicalization in order to allow mixed and multiple encodings: with this change, in these cases, instead of throwing an error it will simply log a worning message.
This should fix, at least as a temporary solution, the recent issues happening after the upgrade to the new ESAPI.



Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/framework/base/src/org/ofbiz/base/util/UtilCodec.java

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 16 07:11:19 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1660031
+/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1660031

Modified: ofbiz/branches/release14.12/framework/base/src/org/ofbiz/base/util/UtilCodec.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/base/src/org/ofbiz/base/util/UtilCodec.java?rev=1660033&r1=1660032&r2=1660033&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/base/src/org/ofbiz/base/util/UtilCodec.java (original)
+++ ofbiz/branches/release14.12/framework/base/src/org/ofbiz/base/util/UtilCodec.java Mon Feb 16 07:11:19 2015
@@ -139,7 +139,7 @@ public class UtilCodec {
     }
 
     public static String canonicalize(String value) throws IntrusionException {
-        return canonicalize(value, true, true);
+        return canonicalize(value, false, false);
     }
 
     public static String canonicalize(String value, boolean strict) throws IntrusionException {