From 98d2524bf498f95e03ffbabacbec344f9b281a48 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 26 Apr 2005 13:29:27 +0000 Subject: [PATCH] fixed base64 decoding bug git-svn-id: http://svn.opengroupware.org/SOPE/trunk@779 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-xml/XmlRpc/ChangeLog | 5 +++++ sope-xml/XmlRpc/Version | 2 +- sope-xml/XmlRpc/XmlRpcDecoder.m | 6 ++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sope-xml/XmlRpc/ChangeLog b/sope-xml/XmlRpc/ChangeLog index 1cfedda9..58207c2a 100644 --- a/sope-xml/XmlRpc/ChangeLog +++ b/sope-xml/XmlRpc/ChangeLog @@ -1,3 +1,8 @@ +2005-04-26 Helge Hess + + * XmlRpcDecoder.m: fixed duplicate decoding of base64 values in XML-RPC + results (v4.5.24) + 2004-12-14 Marcus Mueller * XmlRpc.xcode: minor cleanup diff --git a/sope-xml/XmlRpc/Version b/sope-xml/XmlRpc/Version index 7ec278ff..483f71f6 100644 --- 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 f6c1c40a..e2cc643a 100644 --- 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 { -- 2.39.5