fixed base64 decoding bug

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@779 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-xml/XmlRpc/ChangeLog b/sope-xml/XmlRpc/ChangeLog
index 1cfedda986ebbe2ef64f9df45ae8d0ec0fb89d07..58207c2a5113b0dee4269310558fc229b65130f8 100644 (file)
--- a/sope-xml/XmlRpc/ChangeLog
+++ b/sope-xml/XmlRpc/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-26  Helge Hess  <helge.hess@skyrix.com>
+
+       * XmlRpcDecoder.m: fixed duplicate decoding of base64 values in XML-RPC
+         results (v4.5.24)
+
 2004-12-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * XmlRpc.xcode: minor cleanup

diff --git a/sope-xml/XmlRpc/Version b/sope-xml/XmlRpc/Version
index 7ec278ffa4c9301e80efac617e9280650dc7931a..483f71f67dbf9327a7760e49f233f1a1624e18ca 100644 (file)
--- a/sope-xml/XmlRpc/Version
+++ b/sope-xml/XmlRpc/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=23
+SUBMINOR_VERSION:=24

diff --git a/sope-xml/XmlRpc/XmlRpcDecoder.m b/sope-xml/XmlRpc/XmlRpcDecoder.m
index f6c1c40aa4bafc1bab9de2ac4310af6d5c6671ee..e2cc643ad488ccf26c5a9199d5c3ed2bdd41c031 100644 (file)
--- a/sope-xml/XmlRpc/XmlRpcDecoder.m
+++ b/sope-xml/XmlRpc/XmlRpcDecoder.m
@@ -475,8 +475,10 @@ static BOOL  doDebug         = NO;
 }
 
 - (NSData *)decodeBase64 {
-  return [[self _decodeValueOfClass:DataClass]
-                dataByDecodingBase64];
+#if 0 /* data is already decoded in the XmlRpcValue */
+  tmp = [tmp dataByDecodingBase64];
+#endif
+  return [self _decodeValueOfClass:DataClass];
 }
 
 - (BOOL)decodeBoolean {