OSDN Git Service

merged from v3.31sp1
[nucleus-jp/nucleus-jp-ancient.git] / utf8 / nucleus / libs / xmlrpc.inc.php
index ced24c1..a589e20 100755 (executable)
@@ -1,8 +1,9 @@
-<?php                                  // -*-c++-*-
+<?php
 // by Edd Dumbill (C) 1999-2002
 // <edd@usefulinc.com>
-// $Id: xmlrpc.inc.php,v 1.6 2006-07-12 07:11:47 kimitake Exp $
-// $NucleusJP: xmlrpc.inc.php,v 1.5 2005/08/13 07:24:44 kimitake Exp $
+// $Original: xmlrpc.inc,v 1.158 2007/03/01 21:21:02 ggiunta Exp $
+// $Id: xmlrpc.inc.php,v 1.7 2008-02-08 09:31:22 kimitake Exp $
+// $NucleusJP: xmlrpc.inc.php,v 1.6.2.2 2007/09/07 07:04:24 kimitake Exp $
 
 
 // Copyright (c) 1999,2000,2002 Edd Dumbill.
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 // OF THE POSSIBILITY OF SUCH DAMAGE.
 
-       if (!function_exists('xml_parser_create'))
+       if(!function_exists('xml_parser_create'))
        {
-               // Win 32 fix. From: 'Leo West' <lwest@imaginet.fr>
-               if($WINDIR)
+               // For PHP 4 onward, XML functionality is always compiled-in on windows:
+               // no more need to dl-open it. It might have been compiled out on *nix...
+               if(strtoupper(substr(PHP_OS, 0, 3) != 'WIN'))
                {
-                       dl('php3_xml.dll');
+                       dl('xml.so');
                }
-               else
+       }
+
+       // Try to be backward compat with php < 4.2 (are we not being nice ?)
+       $phpversion = phpversion();
+       if($phpversion[0] == '4' && $phpversion[2] < 2)
+       {
+               // give an opportunity to user to specify where to include other files from
+               if(!defined('PHP_XMLRPC_COMPAT_DIR'))
                {
-                       dl('xml.so');
+                       define('PHP_XMLRPC_COMPAT_DIR',dirname(__FILE__).'/compat/');
+               }
+               if($phpversion[2] == '0')
+               {
+                       if($phpversion[4] < 6)
+                       {
+                               include(PHP_XMLRPC_COMPAT_DIR.'is_callable.php');
+                       }
+                       include(PHP_XMLRPC_COMPAT_DIR.'is_scalar.php');
+                       include(PHP_XMLRPC_COMPAT_DIR.'array_key_exists.php');
+                       include(PHP_XMLRPC_COMPAT_DIR.'version_compare.php');
                }
+               include(PHP_XMLRPC_COMPAT_DIR.'var_export.php');
+               include(PHP_XMLRPC_COMPAT_DIR.'is_a.php');
        }
 
        // G. Giunta 2005/01/29: declare global these variables,
        // so that xmlrpc.inc will work even if included from within a function
-       // NB: it will give warnings in PHP3, so we comment it out
-       // Milosch: Next round, maybe we should explicitly request these via $GLOBALS where used.
-       if (phpversion() >= '4')
-       {
-               global $xmlrpcI4;
-               global $xmlrpcInt;
-               global $xmlrpcDouble;
-               global $xmlrpcBoolean;
-               global $xmlrpcString;
-               global $xmlrpcDateTime;
-               global $xmlrpcBase64;
-               global $xmlrpcArray;
-               global $xmlrpcStruct;
-
-               global $xmlrpcTypes;
-               global $xmlEntities;
-               global $xmlrpcerr;
-               global $xmlrpcstr;
-               global $xmlrpc_defencoding;
-               global $xmlrpc_internalencoding;
-               global $xmlrpcName;
-               global $xmlrpcVersion;
-               global $xmlrpcerruser;
-               global $xmlrpcerrxml;
-               global $xmlrpc_backslash;
-               global $_xh;
-       }
-       $xmlrpcI4='i4';
-       $xmlrpcInt='int';
-       $xmlrpcBoolean='boolean';
-       $xmlrpcDouble='double';
-       $xmlrpcString='string';
-       $xmlrpcDateTime='dateTime.iso8601';
-       $xmlrpcBase64='base64';
-       $xmlrpcArray='array';
-       $xmlrpcStruct='struct';
-
-       $xmlrpcTypes=array(
-               $xmlrpcI4       => 1,
-               $xmlrpcInt      => 1,
-               $xmlrpcBoolean  => 1,
-               $xmlrpcString   => 1,
-               $xmlrpcDouble   => 1,
-               $xmlrpcDateTime => 1,
-               $xmlrpcBase64   => 1,
-               $xmlrpcArray    => 2,
-               $xmlrpcStruct   => 3
+       // Milosch: 2005/08/07 - explicitly request these via $GLOBALS where used.
+       $GLOBALS['xmlrpcI4']='i4';
+       $GLOBALS['xmlrpcInt']='int';
+       $GLOBALS['xmlrpcBoolean']='boolean';
+       $GLOBALS['xmlrpcDouble']='double';
+       $GLOBALS['xmlrpcString']='string';
+       $GLOBALS['xmlrpcDateTime']='dateTime.iso8601';
+       $GLOBALS['xmlrpcBase64']='base64';
+       $GLOBALS['xmlrpcArray']='array';
+       $GLOBALS['xmlrpcStruct']='struct';
+       $GLOBALS['xmlrpcValue']='undefined';
+
+       $GLOBALS['xmlrpcTypes']=array(
+               $GLOBALS['xmlrpcI4']       => 1,
+               $GLOBALS['xmlrpcInt']      => 1,
+               $GLOBALS['xmlrpcBoolean']  => 1,
+               $GLOBALS['xmlrpcString']   => 1,
+               $GLOBALS['xmlrpcDouble']   => 1,
+               $GLOBALS['xmlrpcDateTime'] => 1,
+               $GLOBALS['xmlrpcBase64']   => 1,
+               $GLOBALS['xmlrpcArray']    => 2,
+               $GLOBALS['xmlrpcStruct']   => 3
        );
 
-       $xmlrpc_valid_parents = array(
-               'BOOLEAN' => array('VALUE' => 'VALUE'),
-               'I4' => array('VALUE' => 'VALUE'),
-               'INT' => array('VALUE' => 'VALUE'),
-               'STRING' => array('VALUE' => 'VALUE'),
-               'DOUBLE' => array('VALUE' => 'VALUE'),
-               'DATETIME.ISO8601' => array('VALUE' => 'VALUE'),
-               'BASE64' => array('VALUE' => 'VALUE'),
-               'ARRAY' => array('VALUE' => 'VALUE'),
-               'STRUCT' => array('VALUE' => 'VALUE'),
-               'PARAM' => array('PARAMS' => 'PARAMS'),
-               'METHODNAME' => array('METHODCALL' => 'METHODCALL'),
-               'PARAMS' => array('METHODCALL' => 'METHODCALL', 'METHODRESPONSE' => 'METHODRESPONSE'),
-               'MEMBER' => array('STRUCT' => 'STRUCT'),
-               'NAME' => array('MEMBER' => 'MEMBER'),
-               'DATA' => array('ARRAY' => 'ARRAY'),
-               'FAULT' => array('METHODRESPONSE' => 'METHODRESPONSE'),
-               'VALUE' => array('MEMBER' => 'MEMBER', 'DATA' => 'DATA', 'PARAM' => 'PARAM', 'FAULT' => 'FAULT')
+       $GLOBALS['xmlrpc_valid_parents'] = array(
+               'VALUE' => array('MEMBER', 'DATA', 'PARAM', 'FAULT'),
+               'BOOLEAN' => array('VALUE'),
+               'I4' => array('VALUE'),
+               'INT' => array('VALUE'),
+               'STRING' => array('VALUE'),
+               'DOUBLE' => array('VALUE'),
+               'DATETIME.ISO8601' => array('VALUE'),
+               'BASE64' => array('VALUE'),
+               'MEMBER' => array('STRUCT'),
+               'NAME' => array('MEMBER'),
+               'DATA' => array('ARRAY'),
+               'ARRAY' => array('VALUE'),
+               'STRUCT' => array('VALUE'),
+               'PARAM' => array('PARAMS'),
+               'METHODNAME' => array('METHODCALL'),
+               'PARAMS' => array('METHODCALL', 'METHODRESPONSE'),
+               'FAULT' => array('METHODRESPONSE'),
+               'NIL' => array('VALUE') // only used when extension activated
        );
 
-       $xmlEntities=array(
+       // define extra types for supporting NULL (useful for json or <NIL/>)
+       $GLOBALS['xmlrpcNull']='null';
+       $GLOBALS['xmlrpcTypes']['null']=1;
+
+       // Not in use anymore since 2.0. Shall we remove it?
+       /// @deprecated
+       $GLOBALS['xmlEntities']=array(
                'amp'  => '&',
                'quot' => '"',
                'lt'   => '<',
                'apos' => "'"
        );
 
-       $xmlrpcerr['unknown_method']=1;
-       $xmlrpcstr['unknown_method']='Unknown method';
-       $xmlrpcerr['invalid_return']=2;
-       $xmlrpcstr['invalid_return']='Invalid return payload: enable debugging to examine incoming payload';
-       $xmlrpcerr['incorrect_params']=3;
-       $xmlrpcstr['incorrect_params']='Incorrect parameters passed to method';
-       $xmlrpcerr['introspect_unknown']=4;
-       $xmlrpcstr['introspect_unknown']="Can't introspect: method unknown";
-       $xmlrpcerr['http_error']=5;
-       $xmlrpcstr['http_error']="Didn't receive 200 OK from remote server.";
-       $xmlrpcerr['no_data']=6;
-       $xmlrpcstr['no_data']='No data received from server.';
-       $xmlrpcerr['no_ssl']=7;
-       $xmlrpcstr['no_ssl']='No SSL support compiled in.';
-       $xmlrpcerr['curl_fail']=8;
-       $xmlrpcstr['curl_fail']='CURL error';
-       $xmlrpcerr['invalid_request']=15;
-       $xmlrpcstr['invalid_request']='Invalid request payload';
-
-       $xmlrpcerr['multicall_notstruct'] = 9;
-       $xmlrpcstr['multicall_notstruct'] = 'system.multicall expected struct';
-       $xmlrpcerr['multicall_nomethod']  = 10;
-       $xmlrpcstr['multicall_nomethod']  = 'missing methodName';
-       $xmlrpcerr['multicall_notstring'] = 11;
-       $xmlrpcstr['multicall_notstring'] = 'methodName is not a string';
-       $xmlrpcerr['multicall_recursion'] = 12;
-       $xmlrpcstr['multicall_recursion'] = 'recursive system.multicall forbidden';
-       $xmlrpcerr['multicall_noparams']  = 13;
-       $xmlrpcstr['multicall_noparams']  = 'missing params';
-       $xmlrpcerr['multicall_notarray']  = 14;
-       $xmlrpcstr['multicall_notarray']  = 'params is not an array';
-
-       // The charset encoding expected by the server for received messages and
-       // by the client for received responses
-       $xmlrpc_defencoding='UTF-8';
-       // The encoding used by PHP.
-       // String values received will be converted to this.
-       $xmlrpc_internalencoding='ISO-8859-1';
-
-       $xmlrpcName='XML-RPC for PHP';
-       $xmlrpcVersion='1.2.1';
+       // tables used for transcoding different charsets into us-ascii xml
+
+       $GLOBALS['xml_iso88591_Entities']=array();
+       $GLOBALS['xml_iso88591_Entities']['in'] = array();
+       $GLOBALS['xml_iso88591_Entities']['out'] = array();
+       for ($i = 0; $i < 32; $i++)
+       {
+               $GLOBALS['xml_iso88591_Entities']['in'][] = chr($i);
+               $GLOBALS['xml_iso88591_Entities']['out'][] = '&#'.$i.';';
+       }
+       for ($i = 160; $i < 256; $i++)
+       {
+               $GLOBALS['xml_iso88591_Entities']['in'][] = chr($i);
+               $GLOBALS['xml_iso88591_Entities']['out'][] = '&#'.$i.';';
+       }
+
+       /// @todo add to iso table the characters from cp_1252 range, i.e. 128 to 159.
+       /// These will NOT be present in true ISO-8859-1, but will save the unwary
+       /// windows user from sending junk.
+/*
+$cp1252_to_xmlent =
+  array(
+   '\x80'=>'&#x20AC;', '\x81'=>'?', '\x82'=>'&#x201A;', '\x83'=>'&#x0192;',
+   '\x84'=>'&#x201E;', '\x85'=>'&#x2026;', '\x86'=>'&#x2020;', \x87'=>'&#x2021;',
+   '\x88'=>'&#x02C6;', '\x89'=>'&#x2030;', '\x8A'=>'&#x0160;', '\x8B'=>'&#x2039;',
+   '\x8C'=>'&#x0152;', '\x8D'=>'?', '\x8E'=>'&#x017D;', '\x8F'=>'?',
+   '\x90'=>'?', '\x91'=>'&#x2018;', '\x92'=>'&#x2019;', '\x93'=>'&#x201C;',
+   '\x94'=>'&#x201D;', '\x95'=>'&#x2022;', '\x96'=>'&#x2013;', '\x97'=>'&#x2014;',
+   '\x98'=>'&#x02DC;', '\x99'=>'&#x2122;', '\x9A'=>'&#x0161;', '\x9B'=>'&#x203A;',
+   '\x9C'=>'&#x0153;', '\x9D'=>'?', '\x9E'=>'&#x017E;', '\x9F'=>'&#x0178;'
+  );
+*/
+
+       $GLOBALS['xmlrpcerr']['unknown_method']=1;
+       $GLOBALS['xmlrpcstr']['unknown_method']='Unknown method';
+       $GLOBALS['xmlrpcerr']['invalid_return']=2;
+       $GLOBALS['xmlrpcstr']['invalid_return']='Invalid return payload: enable debugging to examine incoming payload';
+       $GLOBALS['xmlrpcerr']['incorrect_params']=3;
+       $GLOBALS['xmlrpcstr']['incorrect_params']='Incorrect parameters passed to method';
+       $GLOBALS['xmlrpcerr']['introspect_unknown']=4;
+       $GLOBALS['xmlrpcstr']['introspect_unknown']="Can't introspect: method unknown";
+       $GLOBALS['xmlrpcerr']['http_error']=5;
+       $GLOBALS['xmlrpcstr']['http_error']="Didn't receive 200 OK from remote server.";
+       $GLOBALS['xmlrpcerr']['no_data']=6;
+       $GLOBALS['xmlrpcstr']['no_data']='No data received from server.';
+       $GLOBALS['xmlrpcerr']['no_ssl']=7;
+       $GLOBALS['xmlrpcstr']['no_ssl']='No SSL support compiled in.';
+       $GLOBALS['xmlrpcerr']['curl_fail']=8;
+       $GLOBALS['xmlrpcstr']['curl_fail']='CURL error';
+       $GLOBALS['xmlrpcerr']['invalid_request']=15;
+       $GLOBALS['xmlrpcstr']['invalid_request']='Invalid request payload';
+       $GLOBALS['xmlrpcerr']['no_curl']=16;
+       $GLOBALS['xmlrpcstr']['no_curl']='No CURL support compiled in.';
+       $GLOBALS['xmlrpcerr']['server_error']=17;
+       $GLOBALS['xmlrpcstr']['server_error']='Internal server error';
+       $GLOBALS['xmlrpcerr']['multicall_error']=18;
+       $GLOBALS['xmlrpcstr']['multicall_error']='Received from server invalid multicall response';
+
+       $GLOBALS['xmlrpcerr']['multicall_notstruct'] = 9;
+       $GLOBALS['xmlrpcstr']['multicall_notstruct'] = 'system.multicall expected struct';
+       $GLOBALS['xmlrpcerr']['multicall_nomethod']  = 10;
+       $GLOBALS['xmlrpcstr']['multicall_nomethod']  = 'missing methodName';
+       $GLOBALS['xmlrpcerr']['multicall_notstring'] = 11;
+       $GLOBALS['xmlrpcstr']['multicall_notstring'] = 'methodName is not a string';
+       $GLOBALS['xmlrpcerr']['multicall_recursion'] = 12;
+       $GLOBALS['xmlrpcstr']['multicall_recursion'] = 'recursive system.multicall forbidden';
+       $GLOBALS['xmlrpcerr']['multicall_noparams']  = 13;
+       $GLOBALS['xmlrpcstr']['multicall_noparams']  = 'missing params';
+       $GLOBALS['xmlrpcerr']['multicall_notarray']  = 14;
+       $GLOBALS['xmlrpcstr']['multicall_notarray']  = 'params is not an array';
+
+       $GLOBALS['xmlrpcerr']['cannot_decompress']=103;
+       $GLOBALS['xmlrpcstr']['cannot_decompress']='Received from server compressed HTTP and cannot decompress';
+       $GLOBALS['xmlrpcerr']['decompress_fail']=104;
+       $GLOBALS['xmlrpcstr']['decompress_fail']='Received from server invalid compressed HTTP';
+       $GLOBALS['xmlrpcerr']['dechunk_fail']=105;
+       $GLOBALS['xmlrpcstr']['dechunk_fail']='Received from server invalid chunked HTTP';
+       $GLOBALS['xmlrpcerr']['server_cannot_decompress']=106;
+       $GLOBALS['xmlrpcstr']['server_cannot_decompress']='Received from client compressed HTTP request and cannot decompress';
+       $GLOBALS['xmlrpcerr']['server_decompress_fail']=107;
+       $GLOBALS['xmlrpcstr']['server_decompress_fail']='Received from client invalid compressed HTTP request';
+
+       // The charset encoding used by the server for received messages and
+       // by the client for received responses when received charset cannot be determined
+       // or is not supported
+       $GLOBALS['xmlrpc_defencoding']='UTF-8';
+
+       // The encoding used internally by PHP.
+       // String values received as xml will be converted to this, and php strings will be converted to xml
+       // as if having been coded with this
+       $GLOBALS['xmlrpc_internalencoding']='ISO-8859-1';
+
+       $GLOBALS['xmlrpcName']='XML-RPC for PHP';
+       $GLOBALS['xmlrpcVersion']='2.2';
 
        // let user errors start at 800
-       $xmlrpcerruser=800;
+       $GLOBALS['xmlrpcerruser']=800;
        // let XML parse errors start at 100
-       $xmlrpcerrxml=100;
+       $GLOBALS['xmlrpcerrxml']=100;
 
        // formulate backslashes for escaping regexp
-       $xmlrpc_backslash=chr(92).chr(92);
+       // Not in use anymore since 2.0. Shall we remove it?
+       /// @deprecated
+       $GLOBALS['xmlrpc_backslash']=chr(92).chr(92);
+
+       // set to TRUE to enable correct decoding of <NIL/> values
+       $GLOBALS['xmlrpc_null_extension']=false;
 
        // used to store state during parsing
        // quick explanation of components:
        //   ac - used to accumulate values
-       //   isf - used to indicate a fault
+       //   isf - used to indicate a parsing fault (2) or xmlrpcresp fault (1)
+       //   isf_reason - used for storing xmlrpcresp fault string
        //   lv - used to indicate "looking for a value": implements
        //        the logic to allow values with no types to be strings
        //   params - used to store parameters in method calls
        //   method - used to store method name
        //   stack - array with genealogy of xml elements names:
        //           used to validate nesting of xmlrpc elements
-
-       $_xh=array();
+       $GLOBALS['_xh']=null;
 
        /**
+       * Convert a string to the correct XML representation in a target charset
        * To help correct communication of non-ascii chars inside strings, regardless
        * of the charset used when sending requests, parsing them, sending responses
-       * and parsing responses, convert all non-ascii chars present in the message
+       * and parsing responses, an option is to convert all non-ascii chars present in the message
        * into their equivalent 'charset entity'. Charset entities enumerated this way
        * are independent of the charset encoding used to transmit them, and all XML
        * parsers are bound to understand them.
+       * Note that in the std case we are not sending a charset encoding mime type
+       * along with http headers, so we are bound by RFC 3023 to emit strict us-ascii.
+       *
+       * @todo do a bit of basic benchmarking (strtr vs. str_replace)
+       * @todo make usage of iconv() or recode_string() or mb_string() where available
        */
-       function xmlrpc_entity_decode($string)
+       function xmlrpc_encode_entitites($data, $src_encoding='', $dest_encoding='')
        {
-               $top=split('&', $string);
-               $op='';
-               $i=0;
-               while($i<sizeof($top))
+               if ($src_encoding == '')
                {
-                       if (ereg("^([#a-zA-Z0-9]+);", $top[$i], $regs))
-                       {
-                               $op.=ereg_replace("^[#a-zA-Z0-9]+;",
-                               xmlrpc_lookup_entity($regs[1]),
-                               $top[$i]);
-                       }
-                       else
-                       {
-                               if ($i==0)
-                               {
-                                       $op=$top[$i];
-                               }
-                               else
-                               {
-                                       $op.='&' . $top[$i];
-                               }
-                       }
-                       $i++;
+                       // lame, but we know no better...
+                       $src_encoding = $GLOBALS['xmlrpc_internalencoding'];
                }
-               return $op;
-       }
 
-       function xmlrpc_lookup_entity($ent)
-       {
-               global $xmlEntities;
-
-               if (isset($xmlEntities[strtolower($ent)]))
-               {
-                       return $xmlEntities[strtolower($ent)];
-               }
-               if (ereg("^#([0-9]+)$", $ent, $regs))
+               switch(strtoupper($src_encoding.'_'.$dest_encoding))
                {
-                       return chr($regs[1]);
-               }
-               return '?';
-       }
-
-       /**
-        * These entities originate from HTML specs (1.1, proposed 2.0, etc),
-        * and are taken directly from php-4.3.1/ext/mbstring/html_entities.c.
-        * Until php provides functionality to translate these entities in its
-        * core library, use this function.
-        */
-       function xmlrpc_html_entity_xlate($data = '')
-       {
-               $entities = array(
-                       "&nbsp;" => "&#160;",
-                       "&iexcl;" => "&#161;",
-                       "&cent;" => "&#162;",
-                       "&pound;" => "&#163;",
-                       "&curren;" => "&#164;",
-                       "&yen;" => "&#165;",
-                       "&brvbar;" => "&#166;",
-                       "&sect;" => "&#167;",
-                       "&uml;" => "&#168;",
-                       "&copy;" => "&#169;",
-                       "&ordf;" => "&#170;",
-                       "&laquo;" => "&#171;",
-                       "&not;" => "&#172;",
-                       "&shy;" => "&#173;",
-                       "&reg;" => "&#174;",
-                       "&macr;" => "&#175;",
-                       "&deg;" => "&#176;",
-                       "&plusmn;" => "&#177;",
-                       "&sup2;" => "&#178;",
-                       "&sup3;" => "&#179;",
-                       "&acute;" => "&#180;",
-                       "&micro;" => "&#181;",
-                       "&para;" => "&#182;",
-                       "&middot;" => "&#183;",
-                       "&cedil;" => "&#184;",
-                       "&sup1;" => "&#185;",
-                       "&ordm;" => "&#186;",
-                       "&raquo;" => "&#187;",
-                       "&frac14;" => "&#188;",
-                       "&frac12;" => "&#189;",
-                       "&frac34;" => "&#190;",
-                       "&iquest;" => "&#191;",
-                       "&Agrave;" => "&#192;",
-                       "&Aacute;" => "&#193;",
-                       "&Acirc;" => "&#194;",
-                       "&Atilde;" => "&#195;",
-                       "&Auml;" => "&#196;",
-                       "&Aring;" => "&#197;",
-                       "&AElig;" => "&#198;",
-                       "&Ccedil;" => "&#199;",
-                       "&Egrave;" => "&#200;",
-                       "&Eacute;" => "&#201;",
-                       "&Ecirc;" => "&#202;",
-                       "&Euml;" => "&#203;",
-                       "&Igrave;" => "&#204;",
-                       "&Iacute;" => "&#205;",
-                       "&Icirc;" => "&#206;",
-                       "&Iuml;" => "&#207;",
-                       "&ETH;" => "&#208;",
-                       "&Ntilde;" => "&#209;",
-                       "&Ograve;" => "&#210;",
-                       "&Oacute;" => "&#211;",
-                       "&Ocirc;" => "&#212;",
-                       "&Otilde;" => "&#213;",
-                       "&Ouml;" => "&#214;",
-                       "&times;" => "&#215;",
-                       "&Oslash;" => "&#216;",
-                       "&Ugrave;" => "&#217;",
-                       "&Uacute;" => "&#218;",
-                       "&Ucirc;" => "&#219;",
-                       "&Uuml;" => "&#220;",
-                       "&Yacute;" => "&#221;",
-                       "&THORN;" => "&#222;",
-                       "&szlig;" => "&#223;",
-                       "&agrave;" => "&#224;",
-                       "&aacute;" => "&#225;",
-                       "&acirc;" => "&#226;",
-                       "&atilde;" => "&#227;",
-                       "&auml;" => "&#228;",
-                       "&aring;" => "&#229;",
-                       "&aelig;" => "&#230;",
-                       "&ccedil;" => "&#231;",
-                       "&egrave;" => "&#232;",
-                       "&eacute;" => "&#233;",
-                       "&ecirc;" => "&#234;",
-                       "&euml;" => "&#235;",
-                       "&igrave;" => "&#236;",
-                       "&iacute;" => "&#237;",
-                       "&icirc;" => "&#238;",
-                       "&iuml;" => "&#239;",
-                       "&eth;" => "&#240;",
-                       "&ntilde;" => "&#241;",
-                       "&ograve;" => "&#242;",
-                       "&oacute;" => "&#243;",
-                       "&ocirc;" => "&#244;",
-                       "&otilde;" => "&#245;",
-                       "&ouml;" => "&#246;",
-                       "&divide;" => "&#247;",
-                       "&oslash;" => "&#248;",
-                       "&ugrave;" => "&#249;",
-                       "&uacute;" => "&#250;",
-                       "&ucirc;" => "&#251;",
-                       "&uuml;" => "&#252;",
-                       "&yacute;" => "&#253;",
-                       "&thorn;" => "&#254;",
-                       "&yuml;" => "&#255;",
-                       "&OElig;" => "&#338;",
-                       "&oelig;" => "&#339;",
-                       "&Scaron;" => "&#352;",
-                       "&scaron;" => "&#353;",
-                       "&Yuml;" => "&#376;",
-                       "&fnof;" => "&#402;",
-                       "&circ;" => "&#710;",
-                       "&tilde;" => "&#732;",
-                       "&Alpha;" => "&#913;",
-                       "&Beta;" => "&#914;",
-                       "&Gamma;" => "&#915;",
-                       "&Delta;" => "&#916;",
-                       "&Epsilon;" => "&#917;",
-                       "&Zeta;" => "&#918;",
-                       "&Eta;" => "&#919;",
-                       "&Theta;" => "&#920;",
-                       "&Iota;" => "&#921;",
-                       "&Kappa;" => "&#922;",
-                       "&Lambda;" => "&#923;",
-                       "&Mu;" => "&#924;",
-                       "&Nu;" => "&#925;",
-                       "&Xi;" => "&#926;",
-                       "&Omicron;" => "&#927;",
-                       "&Pi;" => "&#928;",
-                       "&Rho;" => "&#929;",
-                       "&Sigma;" => "&#931;",
-                       "&Tau;" => "&#932;",
-                       "&Upsilon;" => "&#933;",
-                       "&Phi;" => "&#934;",
-                       "&Chi;" => "&#935;",
-                       "&Psi;" => "&#936;",
-                       "&Omega;" => "&#937;",
-                       "&beta;" => "&#946;",
-                       "&gamma;" => "&#947;",
-                       "&delta;" => "&#948;",
-                       "&epsilon;" => "&#949;",
-                       "&zeta;" => "&#950;",
-                       "&eta;" => "&#951;",
-                       "&theta;" => "&#952;",
-                       "&iota;" => "&#953;",
-                       "&kappa;" => "&#954;",
-                       "&lambda;" => "&#955;",
-                       "&mu;" => "&#956;",
-                       "&nu;" => "&#957;",
-                       "&xi;" => "&#958;",
-                       "&omicron;" => "&#959;",
-                       "&pi;" => "&#960;",
-                       "&rho;" => "&#961;",
-                       "&sigmaf;" => "&#962;",
-                       "&sigma;" => "&#963;",
-                       "&tau;" => "&#964;",
-                       "&upsilon;" => "&#965;",
-                       "&phi;" => "&#966;",
-                       "&chi;" => "&#967;",
-                       "&psi;" => "&#968;",
-                       "&omega;" => "&#969;",
-                       "&thetasym;" => "&#977;",
-                       "&upsih;" => "&#978;",
-                       "&piv;" => "&#982;",
-                       "&ensp;" => "&#8194;",
-                       "&emsp;" => "&#8195;",
-                       "&thinsp;" => "&#8201;",
-                       "&zwnj;" => "&#8204;",
-                       "&zwj;" => "&#8205;",
-                       "&lrm;" => "&#8206;",
-                       "&rlm;" => "&#8207;",
-                       "&ndash;" => "&#8211;",
-                       "&mdash;" => "&#8212;",
-                       "&lsquo;" => "&#8216;",
-                       "&rsquo;" => "&#8217;",
-                       "&sbquo;" => "&#8218;",
-                       "&ldquo;" => "&#8220;",
-                       "&rdquo;" => "&#8221;",
-                       "&bdquo;" => "&#8222;",
-                       "&dagger;" => "&#8224;",
-                       "&Dagger;" => "&#8225;",
-                       "&bull;" => "&#8226;",
-                       "&hellip;" => "&#8230;",
-                       "&permil;" => "&#8240;",
-                       "&prime;" => "&#8242;",
-                       "&Prime;" => "&#8243;",
-                       "&lsaquo;" => "&#8249;",
-                       "&rsaquo;" => "&#8250;",
-                       "&oline;" => "&#8254;",
-                       "&frasl;" => "&#8260;",
-                       "&euro;" => "&#8364;",
-                       "&weierp;" => "&#8472;",
-                       "&image;" => "&#8465;",
-                       "&real;" => "&#8476;",
-                       "&trade;" => "&#8482;",
-                       "&alefsym;" => "&#8501;",
-                       "&larr;" => "&#8592;",
-                       "&uarr;" => "&#8593;",
-                       "&rarr;" => "&#8594;",
-                       "&darr;" => "&#8595;",
-                       "&harr;" => "&#8596;",
-                       "&crarr;" => "&#8629;",
-                       "&lArr;" => "&#8656;",
-                       "&uArr;" => "&#8657;",
-                       "&rArr;" => "&#8658;",
-                       "&dArr;" => "&#8659;",
-                       "&hArr;" => "&#8660;",
-                       "&forall;" => "&#8704;",
-                       "&part;" => "&#8706;",
-                       "&exist;" => "&#8707;",
-                       "&empty;" => "&#8709;",
-                       "&nabla;" => "&#8711;",
-                       "&isin;" => "&#8712;",
-                       "&notin;" => "&#8713;",
-                       "&ni;" => "&#8715;",
-                       "&prod;" => "&#8719;",
-                       "&sum;" => "&#8721;",
-                       "&minus;" => "&#8722;",
-                       "&lowast;" => "&#8727;",
-                       "&radic;" => "&#8730;",
-                       "&prop;" => "&#8733;",
-                       "&infin;" => "&#8734;",
-                       "&ang;" => "&#8736;",
-                       "&and;" => "&#8743;",
-                       "&or;" => "&#8744;",
-                       "&cap;" => "&#8745;",
-                       "&cup;" => "&#8746;",
-                       "&int;" => "&#8747;",
-                       "&there4;" => "&#8756;",
-                       "&sim;" => "&#8764;",
-                       "&cong;" => "&#8773;",
-                       "&asymp;" => "&#8776;",
-                       "&ne;" => "&#8800;",
-                       "&equiv;" => "&#8801;",
-                       "&le;" => "&#8804;",
-                       "&ge;" => "&#8805;",
-                       "&sub;" => "&#8834;",
-                       "&sup;" => "&#8835;",
-                       "&nsub;" => "&#8836;",
-                       "&sube;" => "&#8838;",
-                       "&supe;" => "&#8839;",
-                       "&oplus;" => "&#8853;",
-                       "&otimes;" => "&#8855;",
-                       "&perp;" => "&#8869;",
-                       "&sdot;" => "&#8901;",
-                       "&lceil;" => "&#8968;",
-                       "&rceil;" => "&#8969;",
-                       "&lfloor;" => "&#8970;",
-                       "&rfloor;" => "&#8971;",
-                       "&lang;" => "&#9001;",
-                       "&rang;" => "&#9002;",
-                       "&loz;" => "&#9674;",
-                       "&spades;" => "&#9824;",
-                       "&clubs;" => "&#9827;",
-                       "&hearts;" => "&#9829;",
-                       "&diams;" => "&#9830;");
-               return strtr($data, $entities);
-       }
-
-       function xmlrpc_encode_entitites($data) 
+                       case 'ISO-8859-1_':
+                       case 'ISO-8859-1_US-ASCII':
+                               $escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'), $data);
+                               $escaped_data = str_replace($GLOBALS['xml_iso88591_Entities']['in'], $GLOBALS['xml_iso88591_Entities']['out'], $escaped_data);
+                               break;
+                       case 'ISO-8859-1_UTF-8':
+                               $escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'), $data);
+                               $escaped_data = utf8_encode($escaped_data);
+                               break;
+                       case 'ISO-8859-1_ISO-8859-1':
+                       case 'US-ASCII_US-ASCII':
+                       case 'US-ASCII_UTF-8':
+                       case 'US-ASCII_':
+                       case 'US-ASCII_ISO-8859-1':
+                       case 'UTF-8_UTF-8':
+                               $escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'), $data);
+                               break;
+                       case 'UTF-8_':
+                       case 'UTF-8_US-ASCII':
+                       case 'UTF-8_ISO-8859-1':
+       // NB: this will choke on invalid UTF-8, going most likely beyond EOF
+       $escaped_data = '';
+       // be kind to users creating string xmlrpcvals out of different php types
+       $data = (string) $data;
+       $ns = strlen ($data);
+       for ($nn = 0; $nn < $ns; $nn++)
        {
-               $length = strlen($data);
-               $escapeddata = "";
-               for($position = 0; $position < $length; $position++)
+               $ch = $data[$nn];
+               $ii = ord($ch);
+               //1 7 0bbbbbbb (127)
+               if ($ii < 128)
                {
-                       $character = substr($data, $position, 1);
-                       $code = Ord($character);
-                       switch($code) {
+                       /// @todo shall we replace this with a (supposedly) faster str_replace?
+                       switch($ii){
                                case 34:
-                               $character = "&quot;";
-                               break;
+                                       $escaped_data .= '&quot;';
+                                       break;
                                case 38:
-                               $character = "&amp;";
-                               break;
+                                       $escaped_data .= '&amp;';
+                                       break;
                                case 39:
-                               $character = "&apos;";
-                               break;
+                                       $escaped_data .= '&apos;';
+                                       break;
                                case 60:
-                               $character = "&lt;";
-                               break;
+                                       $escaped_data .= '&lt;';
+                                       break;
                                case 62:
-                               $character = "&gt;";
-                               break;
+                                       $escaped_data .= '&gt;';
+                                       break;
                                default:
-                               if ($code < 32 || $code > 159)
-                                       $character = ("&#".strval($code).";");
+                                       $escaped_data .= $ch;
+                       } // switch
+               }
+               //2 11 110bbbbb 10bbbbbb (2047)
+               else if ($ii>>5 == 6)
+               {
+                       $b1 = ($ii & 31);
+                       $ii = ord($data[$nn+1]);
+                       $b2 = ($ii & 63);
+                       $ii = ($b1 * 64) + $b2;
+                       $ent = sprintf ('&#%d;', $ii);
+                       $escaped_data .= $ent;
+                       $nn += 1;
+               }
+               //3 16 1110bbbb 10bbbbbb 10bbbbbb
+               else if ($ii>>4 == 14)
+               {
+                       $b1 = ($ii & 31);
+                       $ii = ord($data[$nn+1]);
+                       $b2 = ($ii & 63);
+                       $ii = ord($data[$nn+2]);
+                       $b3 = ($ii & 63);
+                       $ii = ((($b1 * 64) + $b2) * 64) + $b3;
+                       $ent = sprintf ('&#%d;', $ii);
+                       $escaped_data .= $ent;
+                       $nn += 2;
+               }
+               //4 21 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
+               else if ($ii>>3 == 30)
+               {
+                       $b1 = ($ii & 31);
+                       $ii = ord($data[$nn+1]);
+                       $b2 = ($ii & 63);
+                       $ii = ord($data[$nn+2]);
+                       $b3 = ($ii & 63);
+                       $ii = ord($data[$nn+3]);
+                       $b4 = ($ii & 63);
+                       $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4;
+                       $ent = sprintf ('&#%d;', $ii);
+                       $escaped_data .= $ent;
+                       $nn += 3;
+               }
+       }
                                break;
-                       }
-                       $escapeddata .= $character;
+                       default:
+                               $escaped_data = '';
+                               error_log("Converting from $src_encoding to $dest_encoding: not supported...");
                }
-               return $escapeddata;
+               return $escaped_data;
        }
 
-       function xmlrpc_se($parser, $name, $attrs)
+       /// xml parser handler function for opening element tags
+       function xmlrpc_se($parser, $name, $attrs, $accept_single_vals=false)
        {
-               global $_xh, $xmlrpcDateTime, $xmlrpcString, $xmlrpc_valid_parents;
-
                // if invalid xmlrpc already detected, skip all processing
-               if ($_xh[$parser]['isf'] < 2)
-               {
-
-               // check for correct element nesting
-               // top level element can only be of 2 types
-               if ($_xh[$parser]['sp'] == 0)
+               if ($GLOBALS['_xh']['isf'] < 2)
                {
-                       if ($name != 'METHODRESPONSE' && $name != 'METHODCALL')
+                       // check for correct element nesting
+                       // top level element can only be of 2 types
+                       /// @todo optimization creep: save this check into a bool variable, instead of using count() every time:
+                       ///       there is only a single top level element in xml anyway
+                       if (count($GLOBALS['_xh']['stack']) == 0)
                        {
-                               $_xh[$parser]['isf'] = 2;
-                               $_xh[$parser]['isf_reason'] = 'missing top level xmlrpc element';
-                               return;
+                               if ($name != 'METHODRESPONSE' && $name != 'METHODCALL' && (
+                                       $name != 'VALUE' && !$accept_single_vals))
+                               {
+                                       $GLOBALS['_xh']['isf'] = 2;
+                                       $GLOBALS['_xh']['isf_reason'] = 'missing top level xmlrpc element';
+                                       return;
+                               }
+                               else
+                               {
+                                       $GLOBALS['_xh']['rt'] = strtolower($name);
+                               }
                        }
-               }
-               else
-               {
-                       // not top level element: see if parent is OK
-                       $parent = $_xh[$parser]['stack'][$_xh[$parser]['sp']-1];
-                       if (!isset($xmlrpc_valid_parents[$name][$parent]))
+                       else
                        {
-                               $_xh[$parser]['isf'] = 2;
-                               $_xh[$parser]['isf_reason'] = "xmlrpc element $name cannot be child of $parent";
-                               return;
-                       }
-               }
-
-               switch($name)
-               {
-                       case 'STRUCT':
-                       case 'ARRAY':
-                               //$_xh[$parser]['st'].='array(';
-                               //$_xh[$parser]['cm']++;
-                               // this last line turns quoting off
-                               // this means if we get an empty array we'll
-                               // simply get a bit of whitespace in the eval
-                               //$_xh[$parser]['qt']=0;
-
-                               // create an empty array to hold child values, and push it onto appropriate stack
-                               $cur_val = array();
-                               $cur_val['values'] = array();
-                               $cur_val['type'] = $name;
-                               $_xh[$parser]['valuestack'][$_xh[$parser]['vsp']] = $cur_val;
-                               $_xh[$parser]['vsp']++;
-                               break;
-                       case 'METHODNAME':
-                       case 'NAME':
-                               //$_xh[$parser]['st'].='"';
-                               $_xh[$parser]['ac']='';
-                               break;
-                       case 'FAULT':
-                               $_xh[$parser]['isf']=1;
-                               break;
-                       case 'PARAM':
-                               //$_xh[$parser]['st']='';
-                               // clear value, so we can check later if no value will passed for this param/member
-                               $_xh[$parser]['value']='';
-                               break;
-                       case 'VALUE':
-                               //$_xh[$parser]['st'].='new xmlrpcval(';
-                               // look for a value: if this is still true by the
-                               // time we reach the end tag for value then the type is string
-                               // by implication
-                               $_xh[$parser]['vt']='value';
-                               $_xh[$parser]['ac']='';
-                               //$_xh[$parser]['qt']=0;
-                               $_xh[$parser]['lv']=1;
-                               break;
-                       case 'I4':
-                       case 'INT':
-                       case 'STRING':
-                       case 'BOOLEAN':
-                       case 'DOUBLE':
-                       case 'DATETIME.ISO8601':
-                       case 'BASE64':
-                               if ($_xh[$parser]['vt']!='value')
-                               {
-                                       //two data elements inside a value: an error occurred!
-                                       $_xh[$parser]['isf'] = 2;
-                                       $_xh[$parser]['isf_reason'] = "$name element following a {$_xh[$parser]['vt']} element inside a single value";
+                               // not top level element: see if parent is OK
+                               $parent = end($GLOBALS['_xh']['stack']);
+                               if (!array_key_exists($name, $GLOBALS['xmlrpc_valid_parents']) || !in_array($parent, $GLOBALS['xmlrpc_valid_parents'][$name]))
+                               {
+                                       $GLOBALS['_xh']['isf'] = 2;
+                                       $GLOBALS['_xh']['isf_reason'] = "xmlrpc element $name cannot be child of $parent";
                                        return;
                                }
+                       }
 
-                               // reset the accumulator
-                               $_xh[$parser]['ac']='';
-
-                               /*if ($name=='DATETIME.ISO8601' || $name=='STRING')
-                               {
-                                       $_xh[$parser]['qt']=1;
-                                       if ($name=='DATETIME.ISO8601')
+                       switch($name)
+                       {
+                               // optimize for speed switch cases: most common cases first
+                               case 'VALUE':
+                                       /// @todo we could check for 2 VALUE elements inside a MEMBER or PARAM element
+                                       $GLOBALS['_xh']['vt']='value'; // indicator: no value found yet
+                                       $GLOBALS['_xh']['ac']='';
+                                       $GLOBALS['_xh']['lv']=1;
+                                       $GLOBALS['_xh']['php_class']=null;
+                                       break;
+                               case 'I4':
+                               case 'INT':
+                               case 'STRING':
+                               case 'BOOLEAN':
+                               case 'DOUBLE':
+                               case 'DATETIME.ISO8601':
+                               case 'BASE64':
+                                       if ($GLOBALS['_xh']['vt']!='value')
                                        {
-                                               $_xh[$parser]['vt']=$xmlrpcDateTime;
+                                               //two data elements inside a value: an error occurred!
+                                               $GLOBALS['_xh']['isf'] = 2;
+                                               $GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";
+                                               return;
                                        }
-                               }
-                               elseif ($name=='BASE64')
-                               {
-                                       $_xh[$parser]['qt']=2;
-                               }
-                               else
-                               {
-                                       // No quoting is required here -- but
-                                       // at the end of the element we must check
-                                       // for data format errors.
-                                       $_xh[$parser]['qt']=0;
-                               }*/
-                               break;
-                       case 'MEMBER':
-                               //$_xh[$parser]['ac']='';
-                               // avoid warnings later on if no NAME is found before VALUE inside
-                               // a struct member predefining member name as NULL
-                               $_xh[$parser]['valuestack'][$_xh[$parser]['vsp']-1]['name'] = '';
-                               // clear value, so we can check later if no value will passed for this param/member
-                               $_xh[$parser]['value']='';
-                               break;
-                       case 'DATA':
-                       case 'METHODCALL':
-                       case 'METHODRESPONSE':
-                       case 'PARAMS':
-                               // valid elements that add little to processing
-                               break;
-                       default:
-                               /// INVALID ELEMENT: RAISE ISF so that it is later recognized!!!
-                               $_xh[$parser]['isf'] = 2;
-                               $_xh[$parser]['isf_reason'] = "found not-xmlrpc xml element $name";
-                               break;
-               }
+                                       $GLOBALS['_xh']['ac']=''; // reset the accumulator
+                                       break;
+                               case 'STRUCT':
+                               case 'ARRAY':
+                                       if ($GLOBALS['_xh']['vt']!='value')
+                                       {
+                                               //two data elements inside a value: an error occurred!
+                                               $GLOBALS['_xh']['isf'] = 2;
+                                               $GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";
+                                               return;
+                                       }
+                                       // create an empty array to hold child values, and push it onto appropriate stack
+                                       $cur_val = array();
+                                       $cur_val['values'] = array();
+                                       $cur_val['type'] = $name;
+                                       // check for out-of-band information to rebuild php objs
+                                       // and in case it is found, save it
+                                       if (@isset($attrs['PHP_CLASS']))
+                                       {
+                                               $cur_val['php_class'] = $attrs['PHP_CLASS'];
+                                       }
+                                       $GLOBALS['_xh']['valuestack'][] = $cur_val;
+                                       $GLOBALS['_xh']['vt']='data'; // be prepared for a data element next
+                                       break;
+                               case 'DATA':
+                                       if ($GLOBALS['_xh']['vt']!='data')
+                                       {
+                                               //two data elements inside a value: an error occurred!
+                                               $GLOBALS['_xh']['isf'] = 2;
+                                               $GLOBALS['_xh']['isf_reason'] = "found two data elements inside an array element";
+                                               return;
+                                       }
+                               case 'METHODCALL':
+                               case 'METHODRESPONSE':
+                               case 'PARAMS':
+                                       // valid elements that add little to processing
+                                       break;
+                               case 'METHODNAME':
+                               case 'NAME':
+                                       /// @todo we could check for 2 NAME elements inside a MEMBER element
+                                       $GLOBALS['_xh']['ac']='';
+                                       break;
+                               case 'FAULT':
+                                       $GLOBALS['_xh']['isf']=1;
+                                       break;
+                               case 'MEMBER':
+                                       $GLOBALS['_xh']['valuestack'][count($GLOBALS['_xh']['valuestack'])-1]['name']=''; // set member name to null, in case we do not find in the xml later on
+                                       //$GLOBALS['_xh']['ac']='';
+                                       // Drop trough intentionally
+                               case 'PARAM':
+                                       // clear value type, so we can check later if no value has been passed for this param/member
+                                       $GLOBALS['_xh']['vt']=null;
+                                       break;
+                               case 'NIL':
+                                       if ($GLOBALS['xmlrpc_null_extension'])
+                                       {
+                                               if ($GLOBALS['_xh']['vt']!='value')
+                                               {
+                                                       //two data elements inside a value: an error occurred!
+                                                       $GLOBALS['_xh']['isf'] = 2;
+                                                       $GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";
+                                                       return;
+                                               }
+                                               $GLOBALS['_xh']['ac']=''; // reset the accumulator
+                                               break;
+                                       }
+                                       // we do not support the <NIL/> extension, so
+                                       // drop through intentionally
+                               default:
+                                       /// INVALID ELEMENT: RAISE ISF so that it is later recognized!!!
+                                       $GLOBALS['_xh']['isf'] = 2;
+                                       $GLOBALS['_xh']['isf_reason'] = "found not-xmlrpc xml element $name";
+                                       break;
+                       }
 
-               // Save current element name to stack, to validate nesting
-               $_xh[$parser]['stack'][$_xh[$parser]['sp']] = $name;
-               $_xh[$parser]['sp']++;
+                       // Save current element name to stack, to validate nesting
+                       $GLOBALS['_xh']['stack'][] = $name;
 
-               if ($name!='VALUE')
-               {
-                       $_xh[$parser]['lv']=0;
+                       /// @todo optimization creep: move this inside the big switch() above
+                       if($name!='VALUE')
+                       {
+                               $GLOBALS['_xh']['lv']=0;
+                       }
                }
        }
-       }
 
-       function xmlrpc_ee($parser, $name)
+       /// Used in decoding xml chunks that might represent single xmlrpc values
+       function xmlrpc_se_any($parser, $name, $attrs)
        {
-               global $_xh,$xmlrpcTypes,$xmlrpcString,$xmlrpcDateTime;
-
-               if ($_xh[$parser]['isf'] < 2)
-               {
+               xmlrpc_se($parser, $name, $attrs, true);
+       }
 
-               // push this element name from stack
-               // NB: if XML validates, correct opening/closing is guaranteed and
-               // we do not have to check for $name == $curr_elem.
-               // we also checked for proper nesting at start of elements...
-               $_xh[$parser]['sp']--;
-               $curr_elem = $_xh[$parser]['stack'][$_xh[$parser]['sp']];
-               unset($_xh[$parser]['stack'][$_xh[$parser]['sp']]); 
-               switch($name)
+       /// xml parser handler function for close element tags
+       function xmlrpc_ee($parser, $name, $rebuild_xmlrpcvals = true)
+       {
+               if ($GLOBALS['_xh']['isf'] < 2)
                {
-                       case 'STRUCT':
-                       case 'ARRAY':
-                               //if ($_xh[$parser]['cm'] && substr($_xh[$parser]['st'], -1) ==',')
-                               //{
-                               //      $_xh[$parser]['st']=substr($_xh[$parser]['st'],0,-1);
-                               //}
-                               //$_xh[$parser]['st'].=')';
+                       // push this element name from stack
+                       // NB: if XML validates, correct opening/closing is guaranteed and
+                       // we do not have to check for $name == $curr_elem.
+                       // we also checked for proper nesting at start of elements...
+                       $curr_elem = array_pop($GLOBALS['_xh']['stack']);
 
-                               // fetch out of stack array of values, and promote it to current value
-                               $_xh[$parser]['vsp']--;
-                               $cur_val = $_xh[$parser]['valuestack'][$_xh[$parser]['vsp']];
-                               unset($_xh[$parser]['valuestack'][$_xh[$parser]['vsp']]);
-                               $_xh[$parser]['value'] = $cur_val['values'];
-
-                               $_xh[$parser]['vt']=strtolower($name);
-                               //$_xh[$parser]['cm']--;
-                               break;
-                       case 'NAME':
-                               //$_xh[$parser]['st'].= $_xh[$parser]['ac'] . '" => ';
-                               $_xh[$parser]['valuestack'][$_xh[$parser]['vsp']-1]['name'] = $_xh[$parser]['ac'];
-                               break;
-                       case 'BOOLEAN':
-                       case 'I4':
-                       case 'INT':
-                       case 'STRING':
-                       case 'DOUBLE':
-                       case 'DATETIME.ISO8601':
-                       case 'BASE64':
-                               $_xh[$parser]['vt']=strtolower($name);
-                               //if ($_xh[$parser]['qt']==1)                   
-                               if ($name=='STRING')
-                               {
-                                       // we use double quotes rather than single so backslashification works OK
-                                       //$_xh[$parser]['st'].='"'. $_xh[$parser]['ac'] . '"';
-                                       $_xh[$parser]['value']=$_xh[$parser]['ac'];
-                               }
-                               elseif ($name=='DATETIME.ISO8601')
-                               {
-                                       $_xh[$parser]['vt']=$xmlrpcDateTime;
-                                       $_xh[$parser]['value']=$_xh[$parser]['ac'];
-                               }
-                               elseif ($name=='BASE64')
-                               {
-                                       //$_xh[$parser]['st'].='base64_decode("'. $_xh[$parser]['ac'] . '")';
-
-                                       ///@todo check for failure of base64 decoding / catch warnings
-                                       $_xh[$parser]['value']=base64_decode($_xh[$parser]['ac']);
-                               }
-                               elseif ($name=='BOOLEAN')
-                               {
-                                       // special case here: we translate boolean 1 or 0 into PHP
-                                       // constants true or false
-                                       // NB: this simple checks helps a lot sanitizing input, ie no
-                                       // security problems around here
+                       switch($name)
+                       {
+                               case 'VALUE':
+                                       // This if() detects if no scalar was inside <VALUE></VALUE>
+                                       if ($GLOBALS['_xh']['vt']=='value')
+                                       {
+                                               $GLOBALS['_xh']['value']=$GLOBALS['_xh']['ac'];
+                                               $GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcString'];
+                                       }
 
-                                       // [MOD] S. Verberkt (Legolas) (13/02/2006 21:16): Also accept 'true' and 'false'
-                                       if ($_xh[$parser]['ac']=='1' || strcasecmp($_xh[$parser]['ac'], 'true') == 0)
+                                       if ($rebuild_xmlrpcvals)
                                        {
-                                               //$_xh[$parser]['ac']='true';   
-                                               $_xh[$parser]['value']=true;
+                                               // build the xmlrpc val out of the data received, and substitute it
+                                               $temp =& new xmlrpcval($GLOBALS['_xh']['value'], $GLOBALS['_xh']['vt']);
+                                               // in case we got info about underlying php class, save it
+                                               // in the object we're rebuilding
+                                               if (isset($GLOBALS['_xh']['php_class']))
+                                                       $temp->_php_class = $GLOBALS['_xh']['php_class'];
+                                               // check if we are inside an array or struct:
+                                               // if value just built is inside an array, let's move it into array on the stack
+                                               $vscount = count($GLOBALS['_xh']['valuestack']);
+                                               if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type']=='ARRAY')
+                                               {
+                                                       $GLOBALS['_xh']['valuestack'][$vscount-1]['values'][] = $temp;
+                                               }
+                                               else
+                                               {
+                                                       $GLOBALS['_xh']['value'] = $temp;
+                                               }
                                        }
                                        else
                                        {
-                                               //$_xh[$parser]['ac']='false';
-                                               // log if receiveing something strange, even though we set the value to false anyway
-                                               if ($_xh[$parser]['ac']!='0' && strcasecmp($_xh[$parser]['ac'], 'false') != 0)
-                                                       error_log('XML-RPC: invalid value received in BOOLEAN: '.$_xh[$parser]['ac']);
-                                               $_xh[$parser]['value']=false;
-                                       }
-                                       // [/MOD]
+                                               /// @todo this needs to treat correctly php-serialized objects,
+                                               /// since std deserializing is done by php_xmlrpc_decode,
+                                               /// which we will not be calling...
+                                               if (isset($GLOBALS['_xh']['php_class']))
+                                               {
+                                               }
 
-                                       //$_xh[$parser]['st'].=$_xh[$parser]['ac'];
-                               }
-                               elseif ($name=='DOUBLE')
-                               {
-                                       // we have a DOUBLE
-                                       // we must check that only 0123456789-.<space> are characters here
-                                       if (!ereg("^[+-]?[eE0123456789 \\t\\.]+$", $_xh[$parser]['ac']))
+                                               // check if we are inside an array or struct:
+                                               // if value just built is inside an array, let's move it into array on the stack
+                                               $vscount = count($GLOBALS['_xh']['valuestack']);
+                                               if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type']=='ARRAY')
+                                               {
+                                                       $GLOBALS['_xh']['valuestack'][$vscount-1]['values'][] = $GLOBALS['_xh']['value'];
+                                               }
+                                       }
+                                       break;
+                               case 'BOOLEAN':
+                               case 'I4':
+                               case 'INT':
+                               case 'STRING':
+                               case 'DOUBLE':
+                               case 'DATETIME.ISO8601':
+                               case 'BASE64':
+                                       $GLOBALS['_xh']['vt']=strtolower($name);
+                               /// @todo: optimization creep - remove the if/elseif cycle below
+                    /// since the case() in which we are already did that
+                                       if ($name=='STRING')
+                                       {
+                                               $GLOBALS['_xh']['value']=$GLOBALS['_xh']['ac'];
+                                       }
+                                       elseif ($name=='DATETIME.ISO8601')
+                                       {
+                                               if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $GLOBALS['_xh']['ac']))
+                                               {
+                                                       error_log('XML-RPC: invalid value received in DATETIME: '.$GLOBALS['_xh']['ac']);
+                                               }
+                                               $GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcDateTime'];
+                                               $GLOBALS['_xh']['value']=$GLOBALS['_xh']['ac'];
+                                       }
+                                       elseif ($name=='BASE64')
+                                       {
+                                               /// @todo check for failure of base64 decoding / catch warnings
+                                               $GLOBALS['_xh']['value']=base64_decode($GLOBALS['_xh']['ac']);
+                                       }
+                                       elseif ($name=='BOOLEAN')
+                                       {
+                                               // special case here: we translate boolean 1 or 0 into PHP
+                                               // constants true or false.
+                                               // Strings 'true' and 'false' are accepted, even though the
+                                               // spec never mentions them (see eg. Blogger api docs)
+                                               // NB: this simple checks helps a lot sanitizing input, ie no
+                                               // security problems around here
+                                               if ($GLOBALS['_xh']['ac']=='1' || strcasecmp($GLOBALS['_xh']['ac'], 'true') == 0)
+                                               {
+                                                       $GLOBALS['_xh']['value']=true;
+                                               }
+                                               else
+                                               {
+                                                       // log if receiveing something strange, even though we set the value to false anyway
+                                                       if ($GLOBALS['_xh']['ac']!='0' && strcasecmp($_xh[$parser]['ac'], 'false') != 0)
+                                                               error_log('XML-RPC: invalid value received in BOOLEAN: '.$GLOBALS['_xh']['ac']);
+                                                       $GLOBALS['_xh']['value']=false;
+                                               }
+                                       }
+                                       elseif ($name=='DOUBLE')
                                        {
-                                               // TODO: find a better way of throwing an error
-                                               // than this!
-                                               error_log('XML-RPC: non numeric value received in DOUBLE: '.$_xh[$parser]['ac']);
-                                               //$_xh[$parser]['st'].="'ERROR_NON_NUMERIC_FOUND'";
-                                               $_xh[$parser]['value']='ERROR_NON_NUMERIC_FOUND';
+                                               // we have a DOUBLE
+                                               // we must check that only 0123456789-.<space> are characters here
+                                               if (!preg_match('/^[+-]?[eE0123456789 \t.]+$/', $GLOBALS['_xh']['ac']))
+                                               {
+                                                       /// @todo: find a better way of throwing an error
+                                                       // than this!
+                                                       error_log('XML-RPC: non numeric value received in DOUBLE: '.$GLOBALS['_xh']['ac']);
+                                                       $GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';
+                                               }
+                                               else
+                                               {
+                                                       // it's ok, add it on
+                                                       $GLOBALS['_xh']['value']=(double)$GLOBALS['_xh']['ac'];
+                                               }
                                        }
                                        else
                                        {
-                                               // it's ok, add it on
-                                               //$_xh[$parser]['st'].=(double)$_xh[$parser]['ac'];
-                                               $_xh[$parser]['value']=(double)$_xh[$parser]['ac'];
+                                               // we have an I4/INT
+                                               // we must check that only 0123456789-<space> are characters here
+                                               if (!preg_match('/^[+-]?[0123456789 \t]+$/', $GLOBALS['_xh']['ac']))
+                                               {
+                                                       /// @todo find a better way of throwing an error
+                                                       // than this!
+                                                       error_log('XML-RPC: non numeric value received in INT: '.$GLOBALS['_xh']['ac']);
+                                                       $GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';
+                                               }
+                                               else
+                                               {
+                                                       // it's ok, add it on
+                                                       $GLOBALS['_xh']['value']=(int)$GLOBALS['_xh']['ac'];
+                                               }
                                        }
-                               }
-                               else
-                               {
-                                       // we have an I4/INT
-                                       // we must check that only 0123456789-<space> are characters here
-                                       if (!ereg("^[+-]?[0123456789 \\t]+$", $_xh[$parser]['ac']))
+                                       //$GLOBALS['_xh']['ac']=''; // is this necessary?
+                                       $GLOBALS['_xh']['lv']=3; // indicate we've found a value
+                                       break;
+                               case 'NAME':
+                                       $GLOBALS['_xh']['valuestack'][count($GLOBALS['_xh']['valuestack'])-1]['name'] = $GLOBALS['_xh']['ac'];
+                                       break;
+                               case 'MEMBER':
+                                       //$GLOBALS['_xh']['ac']=''; // is this necessary?
+                                       // add to array in the stack the last element built,
+                                       // unless no VALUE was found
+                                       if ($GLOBALS['_xh']['vt'])
+                                       {
+                                               $vscount = count($GLOBALS['_xh']['valuestack']);
+                                               $GLOBALS['_xh']['valuestack'][$vscount-1]['values'][$GLOBALS['_xh']['valuestack'][$vscount-1]['name']] = $GLOBALS['_xh']['value'];
+                                       } else
+                                               error_log('XML-RPC: missing VALUE inside STRUCT in received xml');
+                                       break;
+                               case 'DATA':
+                                       //$GLOBALS['_xh']['ac']=''; // is this necessary?
+                                       $GLOBALS['_xh']['vt']=null; // reset this to check for 2 data elements in a row - even if they're empty
+                                       break;
+                               case 'STRUCT':
+                               case 'ARRAY':
+                                       // fetch out of stack array of values, and promote it to current value
+                                       $curr_val = array_pop($GLOBALS['_xh']['valuestack']);
+                                       $GLOBALS['_xh']['value'] = $curr_val['values'];
+                                       $GLOBALS['_xh']['vt']=strtolower($name);
+                                       if (isset($curr_val['php_class']))
                                        {
-                                               // TODO: find a better way of throwing an error
-                                               // than this!
-                                               error_log('XML-RPC: non numeric value received in INT: '.$_xh[$parser]['ac']);
-                                               //$_xh[$parser]['st'].="'ERROR_NON_NUMERIC_FOUND'";
-                                               $_xh[$parser]['value']='ERROR_NON_NUMERIC_FOUND';
+                                               $GLOBALS['_xh']['php_class'] = $curr_val['php_class'];
+                                       }
+                                       break;
+                               case 'PARAM':
+                                       // add to array of params the current value,
+                                       // unless no VALUE was found
+                                       if ($GLOBALS['_xh']['vt'])
+                                       {
+                                               $GLOBALS['_xh']['params'][]=$GLOBALS['_xh']['value'];
+                                               $GLOBALS['_xh']['pt'][]=$GLOBALS['_xh']['vt'];
                                        }
                                        else
+                                               error_log('XML-RPC: missing VALUE inside PARAM in received xml');
+                                       break;
+                               case 'METHODNAME':
+                                       $GLOBALS['_xh']['method']=preg_replace('/^[\n\r\t ]+/', '', $GLOBALS['_xh']['ac']);
+                                       break;
+                               case 'NIL':
+                                       if ($GLOBALS['xmlrpc_null_extension'])
                                        {
-                                               // it's ok, add it on
-                                               //$_xh[$parser]['st'].=(int)$_xh[$parser]['ac'];
-                                               $_xh[$parser]['value']=(int)$_xh[$parser]['ac'];
+                                               $GLOBALS['_xh']['vt']='null';
+                                               $GLOBALS['_xh']['value']=null;
+                                               $GLOBALS['_xh']['lv']=3;
+                                               break;
                                        }
-                               }
-                               $_xh[$parser]['ac']='';
-                               //$_xh[$parser]['qt']=0;
-                               $_xh[$parser]['lv']=3; // indicate we've found a value
-                               break;
-                       case 'VALUE':
-                               // This if() detects if no scalar was inside <VALUE></VALUE>
-                               if ($_xh[$parser]['vt']=='value')
-                               {
-                                       $_xh[$parser]['value']=$_xh[$parser]['ac'];
-                                       $_xh[$parser]['vt']=$xmlrpcString;
-                               }
-                               /*if (strlen($_xh[$parser]['ac'])>0 &&
-                                       $_xh[$parser]['vt']==$xmlrpcString)
-                               {
-                                       $_xh[$parser]['st'].='"'. $_xh[$parser]['ac'] . '"';
-                               }
-                               // This if() detects if no scalar was inside <VALUE></VALUE>
-                               // and pads an empty ''.
-                               if($_xh[$parser]['st'][strlen($_xh[$parser]['st'])-1] == '(')
-                               {
-                                       $_xh[$parser]['st'].= '""';
-                               }
-                               // G. Giunta 2005/03/12 save some chars in the reconstruction of string vals...
-                               if ($_xh[$parser]['vt'] != $xmlrpcString)
-                                       $_xh[$parser]['st'].=", '" . $_xh[$parser]['vt'] . "')";
-                               else
-                                       $_xh[$parser]['st'].=")";
-                               if ($_xh[$parser]['cm'])
-                               {
-                                       $_xh[$parser]['st'].=',';
-                               }*/
-
-                               // build the xmlrpc val out of the data received, and substitute it
-                               $temp = new xmlrpcval($_xh[$parser]['value'], $_xh[$parser]['vt']);
-                               // check if we are inside an array or struct:
-                               // if value just built is inside an array, let's move it into array on the stack
-                               if ($_xh[$parser]['vsp'] && $_xh[$parser]['valuestack'][$_xh[$parser]['vsp']-1]['type']=='ARRAY')
-                               {
-                                       $_xh[$parser]['valuestack'][$_xh[$parser]['vsp']-1]['values'][] = $temp;
-                               }
-                               else
-                               {
-                               $_xh[$parser]['value'] = $temp;
-                               }
-                               break;
-                       case 'MEMBER':
-                               $_xh[$parser]['ac']='';
-                               //$_xh[$parser]['qt']=0;
-                               // add to array in the stack the last element built
-                               // unless no VALUE was found
-                               if ($_xh[$parser]['value'])
-                               {
-                                       $_xh[$parser]['valuestack'][$_xh[$parser]['vsp']-1]['values'][$_xh[$parser]['valuestack'][$_xh[$parser]['vsp']-1]['name']] = $_xh[$parser]['value'];
-                               }
-                               else
-                                       error_log('XML-RPC: missing VALUE inside STRUCT in received xml');
-                               break;
-                       case 'DATA':
-                               $_xh[$parser]['ac']='';
-                               //$_xh[$parser]['qt']=0;
-                               break;
-                       case 'PARAM':
-                               //$_xh[$parser]['params'][]=$_xh[$parser]['st'];
-                               if ($_xh[$parser]['value'])
-                                       $_xh[$parser]['params'][]=$_xh[$parser]['value'];
-                               else
-                                       error_log('XML-RPC: missing VALUE inside PARAM in received xml');
-                               break;
-                       case 'METHODNAME':
-                               $_xh[$parser]['method']=ereg_replace("^[\n\r\t ]+", '', $_xh[$parser]['ac']);
-                               break;
-                       case 'PARAMS':
-                       case 'FAULT':
-                       case 'METHODCALL':
-                       case 'METHORESPONSE':
-                               break;
-                       default:
-                               // End of INVALID ELEMENT!
-                               // shall we add an assert here for unreachable code???
-                               break;
+                                       // drop through intentionally if nil extension not enabled
+                               case 'PARAMS':
+                               case 'FAULT':
+                               case 'METHODCALL':
+                               case 'METHORESPONSE':
+                                       break;
+                               default:
+                                       // End of INVALID ELEMENT!
+                                       // shall we add an assert here for unreachable code???
+                                       break;
+                       }
                }
-               // if it's a valid type name, set the type
-               /*if (isset($xmlrpcTypes[strtolower($name)]))
-               {
-                       $_xh[$parser]['vt']=strtolower($name);
-               }*/
+       }
 
-               }
+       /// Used in decoding xmlrpc requests/responses without rebuilding xmlrpc values
+       function xmlrpc_ee_fast($parser, $name)
+       {
+               xmlrpc_ee($parser, $name, false);
        }
 
+       /// xml parser handler function for character data
        function xmlrpc_cd($parser, $data)
        {
-               global $_xh, $xmlrpc_backslash;
-
-               //if (ereg("^[\n\r \t]+$", $data)) return;
-               // print "adding [${data}]\n";
-
                // skip processing if xml fault already detected
-               if ($_xh[$parser]['isf'] < 2)
-               {
-               if ($_xh[$parser]['lv']!=3)
+               if ($GLOBALS['_xh']['isf'] < 2)
                {
                        // "lookforvalue==3" means that we've found an entire value
                        // and should discard any further character data
-                       if ($_xh[$parser]['lv']==1)
-                       {
-                               // if we've found text and we're just in a <value> then
-                               // turn quoting on, as this will be a string
-                                       //$_xh[$parser]['qt']=1;
-                               // and say we've found a value
-                               $_xh[$parser]['lv']=2;
-                       }
-                       if(!@isset($_xh[$parser]['ac']))
+                       if($GLOBALS['_xh']['lv']!=3)
                        {
-                               $_xh[$parser]['ac'] = '';
-                       }
-                               //$_xh[$parser]['ac'].=str_replace('$', '\$', str_replace('"', '\"', str_replace(chr(92),$xmlrpc_backslash, $data)));
-                               $_xh[$parser]['ac'].=$data;
+                               // G. Giunta 2006-08-23: useless change of 'lv' from 1 to 2
+                               //if($GLOBALS['_xh']['lv']==1)
+                               //{
+                                       // if we've found text and we're just in a <value> then
+                                       // say we've found a value
+                                       //$GLOBALS['_xh']['lv']=2;
+                               //}
+                               // we always initialize the accumulator before starting parsing, anyway...
+                               //if(!@isset($GLOBALS['_xh']['ac']))
+                               //{
+                               //      $GLOBALS['_xh']['ac'] = '';
+                               //}
+                               $GLOBALS['_xh']['ac'].=$data;
                        }
                }
        }
 
+       /// xml parser handler function for 'other stuff', ie. not char data or
+       /// element start/end tag. In fact it only gets called on unknown entities...
        function xmlrpc_dh($parser, $data)
        {
-               global $_xh, $xmlrpc_backslash;
-
                // skip processing if xml fault already detected
-               if ($_xh[$parser]['isf'] < 2)
-               {
-               if (substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';')
+               if ($GLOBALS['_xh']['isf'] < 2)
                {
-                       if ($_xh[$parser]['lv']==1)
+                       if(substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';')
                        {
-                                       //$_xh[$parser]['qt']=1;
-                               $_xh[$parser]['lv']=2;
-                       }
-                               //$_xh[$parser]['ac'].=str_replace('$', '\$', str_replace('"', '\"', str_replace(chr(92),$xmlrpc_backslash, $data)));
-                               $_xh[$parser]['ac'].=$data;
+                               // G. Giunta 2006-08-25: useless change of 'lv' from 1 to 2
+                               //if($GLOBALS['_xh']['lv']==1)
+                               //{
+                               //      $GLOBALS['_xh']['lv']=2;
+                               //}
+                               $GLOBALS['_xh']['ac'].=$data;
                        }
                }
+               return true;
        }
 
        class xmlrpc_client
        {
                var $path;
                var $server;
-               var $port;
+               var $port=0;
+               var $method='http';
                var $errno;
                var $errstr;
                var $debug=0;
                var $username='';
                var $password='';
+               var $authtype=1;
                var $cert='';
                var $certpass='';
-               var $verifypeer=1;
+               var $cacert='';
+               var $cacertdir='';
+               var $key='';
+               var $keypass='';
+               var $verifypeer=true;
                var $verifyhost=1;
                var $no_multicall=false;
-
-               function xmlrpc_client($path, $server, $port=0)
-               {
-                       $this->port=$port; $this->server=$server; $this->path=$path;
-               }
-
-               function setDebug($in)
-               {
-                       if ($in)
+               var $proxy='';
+               var $proxyport=0;
+               var $proxy_user='';
+               var $proxy_pass='';
+               var $proxy_authtype=1;
+               var $cookies=array();
+               /**
+               * List of http compression methods accepted by the client for responses.
+               * NB: PHP supports deflate, gzip compressions out of the box if compiled w. zlib
+               *
+               * NNB: you can set it to any non-empty array for HTTP11 and HTTPS, since
+               * in those cases it will be up to CURL to decide the compression methods
+               * it supports. You might check for the presence of 'zlib' in the output of
+               * curl_version() to determine wheter compression is supported or not
+               */
+               var $accepted_compression = array();
+               /**
+               * Name of compression scheme to be used for sending requests.
+               * Either null, gzip or deflate
+               */
+               var $request_compression = '';
+               /**
+               * CURL handle: used for keep-alive connections (PHP 4.3.8 up, see:
+               * http://curl.haxx.se/docs/faq.html#7.3)
+               */
+               var $xmlrpc_curl_handle = null;
+               /// Wheter to use persistent connections for http 1.1 and https
+               var $keepalive = false;
+               /// Charset encodings that can be decoded without problems by the client
+               var $accepted_charset_encodings = array();
+               /// Charset encoding to be used in serializing request. NULL = use ASCII
+               var $request_charset_encoding = '';
+               /**
+               * Decides the content of xmlrpcresp objects returned by calls to send()
+               * valid strings are 'xmlrpcvals', 'phpvals' or 'xml'
+               */
+               var $return_type = 'xmlrpcvals';
+
+               /**
+               * @param string $path either the complete server URL or the PATH part of the xmlrc server URL, e.g. /xmlrpc/server.php
+               * @param string $server the server name / ip address
+               * @param integer $port the port the server is listening on, defaults to 80 or 443 depending on protocol used
+               * @param string $method the http protocol variant: defaults to 'http', 'https' and 'http11' can be used if CURL is installed
+               */
+               function xmlrpc_client($path, $server='', $port='', $method='')
+               {
+                       // allow user to specify all params in $path
+                       if($server == '' and $port == '' and $method == '')
+                       {
+                               $parts = parse_url($path);
+                               $server = $parts['host'];
+                               $path = $parts['path'];
+                               if(isset($parts['query']))
+                               {
+                                       $path .= '?'.$parts['query'];
+                               }
+                               if(isset($parts['fragment']))
+                               {
+                                       $path .= '#'.$parts['fragment'];
+                               }
+                               if(isset($parts['port']))
+                               {
+                                       $port = $parts['port'];
+                               }
+                               if(isset($parts['scheme']))
+                               {
+                                       $method = $parts['scheme'];
+                               }
+                               if(isset($parts['user']))
+                               {
+                                       $this->username = $parts['user'];
+                               }
+                               if(isset($parts['pass']))
+                               {
+                                       $this->password = $parts['pass'];
+                               }
+                       }
+                       if($path == '' || $path[0] != '/')
                        {
-                               $this->debug=1;
+                               $this->path='/'.$path;
                        }
                        else
                        {
-                               $this->debug=0;
+                               $this->path=$path;
+                       }
+                       $this->server=$server;
+                       if($port != '')
+                       {
+                               $this->port=$port;
                        }
+                       if($method != '')
+                       {
+                               $this->method=$method;
+                       }
+
+                       // if ZLIB is enabled, let the client by default accept compressed responses
+                       if(function_exists('gzinflate') || (
+                               function_exists('curl_init') && (($info = curl_version()) &&
+                               ((is_string($info) && strpos($info, 'zlib') !== null) || isset($info['libz_version'])))
+                       ))
+                       {
+                               $this->accepted_compression = array('gzip', 'deflate');
+                       }
+
+                       // keepalives: enabled by default ONLY for PHP >= 4.3.8
+                       // (see http://curl.haxx.se/docs/faq.html#7.3)
+                       if(version_compare(phpversion(), '4.3.8') >= 0)
+                       {
+                               $this->keepalive = true;
+                       }
+
+                       // by default the xml parser can support these 3 charset encodings
+                       $this->accepted_charset_encodings = array('UTF-8', 'ISO-8859-1', 'US-ASCII');
                }
 
-               function setCredentials($u, $p)
+               /**
+               * Enables/disables the echoing to screen of the xmlrpc responses received
+               * @param integer $debug values 0, 1 and 2 are supported (2 = echo sent msg too, before received response)
+               * @access public
+               */
+               function setDebug($in)
+               {
+                       $this->debug=$in;
+               }
+
+               /**
+               * Add some http BASIC AUTH credentials, used by the client to authenticate
+               * @param string $u username
+               * @param string $p password
+               * @param integer $t auth type. See curl_setopt man page for supported auth types. Defaults to CURLAUTH_BASIC (basic auth)
+               * @access public
+               */
+               function setCredentials($u, $p, $t=1)
                {
                        $this->username=$u;
                        $this->password=$p;
+                       $this->authtype=$t;
                }
 
+               /**
+               * Add a client-side https certificate
+               * @param string $cert
+               * @param string $certpass
+               * @access public
+               */
                function setCertificate($cert, $certpass)
                {
                        $this->cert = $cert;
                        $this->certpass = $certpass;
                }
 
+               /**
+               * Add a CA certificate to verify server with (see man page about
+               * CURLOPT_CAINFO for more details
+               * @param string $cacert certificate file name (or dir holding certificates)
+               * @param bool $is_dir set to true to indicate cacert is a dir. defaults to false
+               * @access public
+               */
+               function setCaCertificate($cacert, $is_dir=false)
+               {
+                       if ($is_dir)
+                       {
+                               $this->cacert = $cacert;
+                       }
+                       else
+                       {
+                               $this->cacertdir = $cacert;
+                       }
+               }
+
+               /**
+               * Set attributes for SSL communication: private SSL key
+               * @param string $key The name of a file containing a private SSL key
+               * @param string $keypass The secret password needed to use the private SSL key
+               * @access public
+               * NB: does not work in older php/curl installs
+               * Thanks to Daniel Convissor
+               */
+               function setKey($key, $keypass)
+               {
+                       $this->key = $key;
+                       $this->keypass = $keypass;
+               }
+
+               /**
+               * Set attributes for SSL communication: verify server certificate
+               * @param bool $i enable/disable verification of peer certificate
+               * @access public
+               */
                function setSSLVerifyPeer($i)
                {
                        $this->verifypeer = $i;
                }
 
+               /**
+               * Set attributes for SSL communication: verify match of server cert w. hostname
+               * @param int $i
+               * @access public
+               */
                function setSSLVerifyHost($i)
                {
                        $this->verifyhost = $i;
                }
 
-               function send($msg, $timeout=0, $method='http')
+               /**
+               * Set proxy info
+               * @param string $proxyhost
+               * @param string $proxyport Defaults to 8080 for HTTP and 443 for HTTPS
+               * @param string $proxyusername Leave blank if proxy has public access
+               * @param string $proxypassword Leave blank if proxy has public access
+               * @param int $proxyauthtype set to constant CURLAUTH_NTLM to use NTLM auth with proxy
+               * @access public
+               */
+               function setProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '', $proxyauthtype = 1)
+               {
+                       $this->proxy = $proxyhost;
+                       $this->proxyport = $proxyport;
+                       $this->proxy_user = $proxyusername;
+                       $this->proxy_pass = $proxypassword;
+                       $this->proxy_authtype = $proxyauthtype;
+               }
+
+               /**
+               * Enables/disables reception of compressed xmlrpc responses.
+               * Note that enabling reception of compressed responses merely adds some standard
+               * http headers to xmlrpc requests. It is up to the xmlrpc server to return
+               * compressed responses when receiving such requests.
+               * @param string $compmethod either 'gzip', 'deflate', 'any' or ''
+               * @access public
+               */
+               function setAcceptedCompression($compmethod)
+               {
+                       if ($compmethod == 'any')
+                               $this->accepted_compression = array('gzip', 'deflate');
+                       else
+                               $this->accepted_compression = array($compmethod);
+               }
+
+               /**
+               * Enables/disables http compression of xmlrpc request.
+               * Take care when sending compressed requests: servers might not support them
+               * (and automatic fallback to uncompressed requests is not yet implemented)
+               * @param string $compmethod either 'gzip', 'deflate' or ''
+               * @access public
+               */
+               function setRequestCompression($compmethod)
+               {
+                       $this->request_compression = $compmethod;
+               }
+
+               /**
+               * Adds a cookie to list of cookies that will be sent to server.
+               * NB: setting any param but name and value will turn the cookie into a 'version 1' cookie:
+               * do not do it unless you know what you are doing
+               * @param string $name
+               * @param string $value
+               * @param string $path
+               * @param string $domain
+               * @param int $port
+               * @access public
+               *
+               * @todo check correctness of urlencoding cookie value (copied from php way of doing it...)
+               */
+               function setCookie($name, $value='', $path='', $domain='', $port=null)
+               {
+                       $this->cookies[$name]['value'] = urlencode($value);
+                       if ($path || $domain || $port)
+                       {
+                               $this->cookies[$name]['path'] = $path;
+                               $this->cookies[$name]['domain'] = $domain;
+                               $this->cookies[$name]['port'] = $port;
+                               $this->cookies[$name]['version'] = 1;
+                       }
+                       else
+                       {
+                               $this->cookies[$name]['version'] = 0;
+                       }
+               }
+
+               /**
+               * Send an xmlrpc request
+               * @param mixed $msg The message object, or an array of messages for using multicall, or the complete xml representation of a request
+               * @param integer $timeout Connection timeout, in seconds, If unspecified, a platform specific timeout will apply
+               * @param string $method if left unspecified, the http protocol chosen during creation of the object will be used
+               * @return xmlrpcresp
+               * @access public
+               */
+               function& send($msg, $timeout=0, $method='')
                {
-                       if (is_array($msg))
+                       // if user deos not specify http protocol, use native method of this client
+                       // (i.e. method set during call to constructor)
+                       if($method == '')
+                       {
+                               $method = $this->method;
+                       }
+
+                       if(is_array($msg))
                        {
                                // $msg is an array of xmlrpcmsg's
-                               return $this->multicall($msg, $timeout, $method);
+                               $r = $this->multicall($msg, $timeout, $method);
+                               return $r;
+                       }
+                       elseif(is_string($msg))
+                       {
+                               $n =& new xmlrpcmsg('');
+                               $n->payload = $msg;
+                               $msg = $n;
                        }
 
                        // where msg is an xmlrpcmsg
                        $msg->debug=$this->debug;
 
-                       if ($method == 'https')
-                       {
-                               return $this->sendPayloadHTTPS($msg,
-                               $this->server,
-                               $this->port, $timeout,
-                               $this->username, $this->password,
-                               $this->cert,
-                               $this->certpass);
+                       if($method == 'https')
+                       {
+                               $r =& $this->sendPayloadHTTPS(
+                                       $msg,
+                                       $this->server,
+                                       $this->port,
+                                       $timeout,
+                                       $this->username,
+                                       $this->password,
+                                       $this->authtype,
+                                       $this->cert,
+                                       $this->certpass,
+                                       $this->cacert,
+                                       $this->cacertdir,
+                                       $this->proxy,
+                                       $this->proxyport,
+                                       $this->proxy_user,
+                                       $this->proxy_pass,
+                                       $this->proxy_authtype,
+                                       $this->keepalive,
+                                       $this->key,
+                                       $this->keypass
+                               );
+                       }
+                       elseif($method == 'http11')
+                       {
+                               $r =& $this->sendPayloadCURL(
+                                       $msg,
+                                       $this->server,
+                                       $this->port,
+                                       $timeout,
+                                       $this->username,
+                                       $this->password,
+                                       $this->authtype,
+                                       null,
+                                       null,
+                                       null,
+                                       null,
+                                       $this->proxy,
+                                       $this->proxyport,
+                                       $this->proxy_user,
+                                       $this->proxy_pass,
+                                       $this->proxy_authtype,
+                                       'http',
+                                       $this->keepalive
+                               );
                        }
                        else
                        {
-                               return $this->sendPayloadHTTP10($msg, $this->server, $this->port,
-                               $timeout, $this->username, 
-                               $this->password);
+                               $r =& $this->sendPayloadHTTP10(
+                                       $msg,
+                                       $this->server,
+                                       $this->port,
+                                       $timeout,
+                                       $this->username,
+                                       $this->password,
+                                       $this->authtype,
+                                       $this->proxy,
+                                       $this->proxyport,
+                                       $this->proxy_user,
+                                       $this->proxy_pass,
+                                       $this->proxy_authtype
+                               );
                        }
+
+                       return $r;
                }
 
-               function sendPayloadHTTP10($msg, $server, $port, $timeout=0,$username='', $password='')
+               /**
+               * @access private
+               */
+               function &sendPayloadHTTP10($msg, $server, $port, $timeout=0,
+                       $username='', $password='', $authtype=1, $proxyhost='',
+                       $proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1)
                {
-                       global $xmlrpcerr, $xmlrpcstr, $xmlrpcName, $xmlrpcVersion, $xmlrpc_defencoding;
-                       if ($port==0)
+                       if($port==0)
                        {
                                $port=80;
                        }
-                       if($timeout>0)
+
+                       // Only create the payload if it was not created previously
+                       if(empty($msg->payload))
                        {
-                               $fp=@fsockopen($server, $port,$this->errno, $this->errstr, $timeout);
+                               $msg->createPayload($this->request_charset_encoding);
+                       }
+
+                       $payload = $msg->payload;
+                       // Deflate request body and set appropriate request headers
+                       if(function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))
+                       {
+                               if($this->request_compression == 'gzip')
+                               {
+                                       $a = @gzencode($payload);
+                                       if($a)
+                                       {
+                                               $payload = $a;
+                                               $encoding_hdr = "Content-Encoding: gzip\r\n";
+                                       }
+                               }
+                               else
+                               {
+                                       $a = @gzcompress($payload);
+                                       if($a)
+                                       {
+                                               $payload = $a;
+                                               $encoding_hdr = "Content-Encoding: deflate\r\n";
+                                       }
+                               }
                        }
                        else
                        {
-                               $fp=@fsockopen($server, $port,$this->errno, $this->errstr);
+                               $encoding_hdr = '';
                        }
-                       if ($fp)
+
+                       // thanks to Grant Rauscher <grant7@firstworld.net> for this
+                       $credentials='';
+                       if($username!='')
                        {
-                               if ($timeout>0 && function_exists('stream_set_timeout'))
-                                       stream_set_timeout($fp, $timeout);
+                               $credentials='Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n";
+                               if ($authtype != 1)
+                               {
+                                       error_log('XML-RPC: xmlrpc_client::send: warning. Only Basic auth is supported with HTTP 1.0');
+                               }
+                       }
+
+                       $accepted_encoding = '';
+                       if(is_array($this->accepted_compression) && count($this->accepted_compression))
+                       {
+                               $accepted_encoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n";
+                       }
+
+                       $proxy_credentials = '';
+                       if($proxyhost)
+                       {
+                               if($proxyport == 0)
+                               {
+                                       $proxyport = 8080;
+                               }
+                               $connectserver = $proxyhost;
+                               $connectport = $proxyport;
+                               $uri = 'http://'.$server.':'.$port.$this->path;
+                               if($proxyusername != '')
+                               {
+                                       if ($proxyauthtype != 1)
+                                       {
+                                               error_log('XML-RPC: xmlrpc_client::send: warning. Only Basic auth to proxy is supported with HTTP 1.0');
+                                       }
+                                       $proxy_credentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyusername.':'.$proxypassword) . "\r\n";
+                               }
                        }
                        else
                        {
-                               $this->errstr='Connect error';
-                               $r=new xmlrpcresp(0, $xmlrpcerr['http_error'],$xmlrpcstr['http_error']);
-                               return $r;
+                               $connectserver = $server;
+                               $connectport = $port;
+                               $uri = $this->path;
                        }
-                       // Only create the payload if it was not created previously
-                       if(empty($msg->payload))
+
+                       // Cookie generation, as per rfc2965 (version 1 cookies) or
+                       // netscape's rules (version 0 cookies)
+                       $cookieheader='';
+                       foreach ($this->cookies as $name => $cookie)
                        {
-                               $msg->createPayload();
+                               if ($cookie['version'])
+                               {
+                                       $cookieheader .= 'Cookie: $Version="' . $cookie['version'] . '"; ';
+                                       $cookieheader .= $name . '="' . $cookie['value'] . '";';
+                                       if ($cookie['path'])
+                                               $cookieheader .= ' $Path="' . $cookie['path'] . '";';
+                                       if ($cookie['domain'])
+                                               $cookieheader .= ' $Domain="' . $cookie['domain'] . '";';
+                                       if ($cookie['port'])
+                                               $cookieheader .= ' $Port="' . $cookie['domain'] . '";';
+                                       $cookieheader = substr($cookieheader, 0, -1) . "\r\n";
+                               }
+                               else
+                               {
+                                       $cookieheader .= 'Cookie: ' . $name . '=' . $cookie['value'] . "\r\n";
+                               }
                        }
 
-                       // thanks to Grant Rauscher <grant7@firstworld.net>
-                       // for this
-                       $credentials='';
-                       if ($username!='')
+                       $op= 'POST ' . $uri. " HTTP/1.0\r\n" .
+                               'User-Agent: ' . $GLOBALS['xmlrpcName'] . ' ' . $GLOBALS['xmlrpcVersion'] . "\r\n" .
+                               'Host: '. $server . ':' . $port . "\r\n" .
+                               $credentials .
+                               $proxy_credentials .
+                               $accepted_encoding .
+                               $encoding_hdr .
+                               'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" .
+                               $cookieheader .
+                               'Content-Type: ' . $msg->content_type . "\r\nContent-Length: " .
+                               strlen($payload) . "\r\n\r\n" .
+                               $payload;
+
+                       if($this->debug > 1)
                        {
-                               $credentials='Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n";
+                               print "<PRE>\n---SENDING---\n" . htmlentities($op) . "\n---END---\n</PRE>";
+                               // let the client see this now in case http times out...
+                               flush();
                        }
 
-                       $op= "POST " . $this->path. " HTTP/1.0\r\n" .
-                               "User-Agent: " . $xmlrpcName . " " . $xmlrpcVersion . "\r\n" .
-                               "Host: ". $server . "\r\n" .
-                               $credentials . 
-                               "Accept-Charset: " . $xmlrpc_defencoding . "\r\n" .
-                               "Content-Type: text/xml\r\nContent-Length: " .
-                               strlen($msg->payload) . "\r\n\r\n" .
-                               $msg->payload;
+                       if($timeout>0)
+                       {
+                               $fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr, $timeout);
+                       }
+                       else
+                       {
+                               $fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr);
+                       }
+                       if($fp)
+                       {
+                               if($timeout>0 && function_exists('stream_set_timeout'))
+                               {
+                                       stream_set_timeout($fp, $timeout);
+                               }
+                       }
+                       else
+                       {
+                               $this->errstr='Connect error: '.$this->errstr;
+                               $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr . ' (' . $this->errno . ')');
+                               return $r;
+                       }
 
-                       if (!fputs($fp, $op, strlen($op)))
+                       if(!fputs($fp, $op, strlen($op)))
                        {
                                $this->errstr='Write error';
-                               $r=new xmlrpcresp(0, $xmlrpcerr['http_error'], $xmlrpcstr['http_error']);
+                               $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr);
                                return $r;
                        }
-                       $resp=$msg->parseResponseFile($fp);
+                       else
+                       {
+                               // reset errno and errstr on succesful socket connection
+                               $this->errstr = '';
+                       }
+                       // G. Giunta 2005/10/24: close socket before parsing.
+                       // should yeld slightly better execution times, and make easier recursive calls (e.g. to follow http redirects)
+                       $ipd='';
+                       while($data=fread($fp, 32768))
+                       {
+                               // shall we check for $data === FALSE?
+                               // as per the manual, it signals an error
+                               $ipd.=$data;
+                       }
                        fclose($fp);
-                       return $resp;
+                       $r =& $msg->parseResponse($ipd, false, $this->return_type);
+                       return $r;
+
                }
 
-               // contributed by Justin Miller <justin@voxel.net>
-               // requires curl to be built into PHP
-               function sendPayloadHTTPS($msg, $server, $port, $timeout=0,$username='', $password='', $cert='',$certpass='')
-               {
-                       global $xmlrpcerr, $xmlrpcstr, $xmlrpcVersion, $xmlrpc_internalencoding;
-                       if ($port == 0)
+               /**
+               * @access private
+               */
+               function &sendPayloadHTTPS($msg, $server, $port, $timeout=0, $username='',
+                       $password='', $authtype=1, $cert='',$certpass='', $cacert='', $cacertdir='',
+                       $proxyhost='', $proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1,
+                       $keepalive=false, $key='', $keypass='')
+               {
+                       $r =& $this->sendPayloadCURL($msg, $server, $port, $timeout, $username,
+                               $password, $authtype, $cert, $certpass, $cacert, $cacertdir, $proxyhost, $proxyport,
+                               $proxyusername, $proxypassword, $proxyauthtype, 'https', $keepalive, $key, $keypass);
+                       return $r;
+               }
+
+               /**
+               * Contributed by Justin Miller <justin@voxel.net>
+               * Requires curl to be built into PHP
+               * NB: CURL versions before 7.11.10 cannot use proxy to talk to https servers!
+               * @access private
+               */
+               function &sendPayloadCURL($msg, $server, $port, $timeout=0, $username='',
+                       $password='', $authtype=1, $cert='', $certpass='', $cacert='', $cacertdir='',
+                       $proxyhost='', $proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1, $method='https',
+                       $keepalive=false, $key='', $keypass='')
+               {
+                       if(!function_exists('curl_init'))
+                       {
+                               $this->errstr='CURL unavailable on this install';
+                               $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_curl'], $GLOBALS['xmlrpcstr']['no_curl']);
+                               return $r;
+                       }
+                       if($method == 'https')
                        {
-                               $port = 443;
+                               if(($info = curl_version()) &&
+                                       ((is_string($info) && strpos($info, 'OpenSSL') === null) || (is_array($info) && !isset($info['ssl_version']))))
+                               {
+                                       $this->errstr='SSL unavailable on this install';
+                                       $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_ssl'], $GLOBALS['xmlrpcstr']['no_ssl']);
+                                       return $r;
+                               }
+                       }
+
+                       if($port == 0)
+                       {
+                               if($method == 'http')
+                               {
+                                       $port = 80;
+                               }
+                               else
+                               {
+                                       $port = 443;
+                               }
                        }
 
                        // Only create the payload if it was not created previously
                        if(empty($msg->payload))
                        {
-                               $msg->createPayload();
+                               $msg->createPayload($this->request_charset_encoding);
                        }
 
-                       if (!function_exists('curl_init'))
+                       // Deflate request body and set appropriate request headers
+                       $payload = $msg->payload;
+                       if(function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))
                        {
-                               $this->errstr='SSL unavailable on this install';
-                               $r=new xmlrpcresp(0, $xmlrpcerr['no_ssl'], $xmlrpcstr['no_ssl']);
-                               return $r;
+                               if($this->request_compression == 'gzip')
+                               {
+                                       $a = @gzencode($payload);
+                                       if($a)
+                                       {
+                                               $payload = $a;
+                                               $encoding_hdr = 'Content-Encoding: gzip';
+                                       }
+                               }
+                               else
+                               {
+                                       $a = @gzcompress($payload);
+                                       if($a)
+                                       {
+                                               $payload = $a;
+                                               $encoding_hdr = 'Content-Encoding: deflate';
+                                       }
+                               }
+                       }
+                       else
+                       {
+                               $encoding_hdr = '';
                        }
 
-                       $curl = curl_init('https://' . $server . ':' . $port . $this->path);
+                       if($this->debug > 1)
+                       {
+                               print "<PRE>\n---SENDING---\n" . htmlentities($payload) . "\n---END---\n</PRE>";
+                               // let the client see this now in case http times out...
+                               flush();
+                       }
+
+                       if(!$keepalive || !$this->xmlrpc_curl_handle)
+                       {
+                               $curl = curl_init($method . '://' . $server . ':' . $port . $this->path);
+                               if($keepalive)
+                               {
+                                       $this->xmlrpc_curl_handle = $curl;
+                               }
+                       }
+                       else
+                       {
+                               $curl = $this->xmlrpc_curl_handle;
+                       }
 
-                       curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
                        // results into variable
-                       if ($this->debug)
+                       curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+
+                       if($this->debug)
                        {
                                curl_setopt($curl, CURLOPT_VERBOSE, 1);
                        }
-                       curl_setopt($curl, CURLOPT_USERAGENT, 'PHP XMLRPC '.$xmlrpcVersion);
-                       // required for XMLRPC
+                       curl_setopt($curl, CURLOPT_USERAGENT, $GLOBALS['xmlrpcName'].' '.$GLOBALS['xmlrpcVersion']);
+                       // required for XMLRPC: post the data
                        curl_setopt($curl, CURLOPT_POST, 1);
-                       // post the data
-                       curl_setopt($curl, CURLOPT_POSTFIELDS, $msg->payload);
                        // the data
-                       curl_setopt($curl, CURLOPT_HEADER, 1);
+                       curl_setopt($curl, CURLOPT_POSTFIELDS, $payload);
+
                        // return the header too
-                       curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type: text/xml', 'Accept-Charset: '.$xmlrpc_internalencoding));
-                       // whether to verify remote host's cert
-                       curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verifypeer);
-                       // whether to verify cert's common name (CN); 0 for no, 1 to verify that it exists, and 2 to verify that it matches the hostname used
-                       curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, $this->verifyhost);
-                       // required for XMLRPC
-                       if ($timeout)
+                       curl_setopt($curl, CURLOPT_HEADER, 1);
+
+                       // will only work with PHP >= 5.0
+                       // NB: if we set an empty string, CURL will add http header indicating
+                       // ALL methods it is supporting. This is possibly a better option than
+                       // letting the user tell what curl can / cannot do...
+                       if(is_array($this->accepted_compression) && count($this->accepted_compression))
+                       {
+                               //curl_setopt($curl, CURLOPT_ENCODING, implode(',', $this->accepted_compression));
+                               // empty string means 'any supported by CURL' (shall we catch errors in case CURLOPT_SSLKEY undefined ?)
+                               if (count($this->accepted_compression) == 1)
+                               {
+                                       curl_setopt($curl, CURLOPT_ENCODING, $this->accepted_compression[0]);
+                               }
+                               else
+                                       curl_setopt($curl, CURLOPT_ENCODING, '');
+                       }
+                       // extra headers
+                       $headers = array('Content-Type: ' . $msg->content_type , 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings));
+                       // if no keepalive is wanted, let the server know it in advance
+                       if(!$keepalive)
+                       {
+                               $headers[] = 'Connection: close';
+                       }
+                       // request compression header
+                       if($encoding_hdr)
+                       {
+                               $headers[] = $encoding_hdr;
+                       }
+
+                       curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+                       // timeout is borked
+                       if($timeout)
                        {
                                curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1);
                        }
-                       // timeout is borked
-                       if ($username && $password)
+
+                       if($username && $password)
+                       {
+                               curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password);
+                               if (defined('CURLOPT_HTTPAUTH'))
+                               {
+                                       curl_setopt($curl, CURLOPT_HTTPAUTH, $authtype);
+                               }
+                               else if ($authtype != 1)
+                               {
+                                       error_log('XML-RPC: xmlrpc_client::send: warning. Only Basic auth is supported by the current PHP/curl install');
+                               }
+                       }
+
+                       if($method == 'https')
                        {
-                               curl_setopt($curl, CURLOPT_USERPWD,"$username:$password");
+                               // set cert file
+                               if($cert)
+                               {
+                                       curl_setopt($curl, CURLOPT_SSLCERT, $cert);
+                               }
+                               // set cert password
+                               if($certpass)
+                               {
+                                       curl_setopt($curl, CURLOPT_SSLCERTPASSWD, $certpass);
+                               }
+                               // whether to verify remote host's cert
+                               curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verifypeer);
+                               // set ca certificates file/dir
+                               if($cacert)
+                               {
+                                       curl_setopt($curl, CURLOPT_CAINFO, $cacert);
+                               }
+                               if($cacertdir)
+                               {
+                                       curl_setopt($curl, CURLOPT_CAPATH, $cacertdir);
+                               }
+                               // set key file (shall we catch errors in case CURLOPT_SSLKEY undefined ?)
+                               if($key)
+                               {
+                                       curl_setopt($curl, CURLOPT_SSLKEY, $key);
+                               }
+                               // set key password (shall we catch errors in case CURLOPT_SSLKEY undefined ?)
+                               if($keypass)
+                               {
+                                       curl_setopt($curl, CURLOPT_SSLKEYPASSWD, $keypass);
+                               }
+                               // whether to verify cert's common name (CN); 0 for no, 1 to verify that it exists, and 2 to verify that it matches the hostname used
+                               curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, $this->verifyhost);
                        }
-                       // set auth stuff
-                       if ($cert)
+
+                       // proxy info
+                       if($proxyhost)
                        {
-                               curl_setopt($curl, CURLOPT_SSLCERT, $cert);
+                               if($proxyport == 0)
+                               {
+                                       $proxyport = 8080; // NB: even for HTTPS, local connection is on port 8080
+                               }
+                               curl_setopt($curl, CURLOPT_PROXY,$proxyhost.':'.$proxyport);
+                               //curl_setopt($curl, CURLOPT_PROXYPORT,$proxyport);
+                               if($proxyusername)
+                               {
+                                       curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyusername.':'.$proxypassword);
+                                       if (defined('CURLOPT_PROXYAUTH'))
+                                       {
+                                               curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyauthtype);
+                                       }
+                                       else if ($proxyauthtype != 1)
+                                       {
+                                               error_log('XML-RPC: xmlrpc_client::send: warning. Only Basic auth to proxy is supported by the current PHP/curl install');
+                                       }
+                               }
                        }
-                       // set cert file
-                       if ($certpass)
+
+                       // NB: should we build cookie http headers by hand rather than let CURL do it?
+                       // the following code does not honour 'expires', 'path' and 'domain' cookie attributes
+                       // set to clint obj the the user...
+                       if (count($this->cookies))
                        {
-                               curl_setopt($curl, CURLOPT_SSLCERTPASSWD,$certpass);
+                               $cookieheader = '';
+                               foreach ($this->cookies as $name => $cookie)
+                               {
+                                       $cookieheader .= $name . '=' . $cookie['value'] . ', ';
+                               }
+                               curl_setopt($curl, CURLOPT_COOKIE, substr($cookieheader, 0, -2));
                        }
-                       // set cert password
 
                        $result = curl_exec($curl);
 
-                       if (!$result)
+                       if(!$result)
                        {
                                $this->errstr='no response';
-                               $resp=new xmlrpcresp(0, $xmlrpcerr['curl_fail'], $xmlrpcstr['curl_fail']. ': '. curl_error($curl));
-                               curl_close($curl);
+                               $resp=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['curl_fail'], $GLOBALS['xmlrpcstr']['curl_fail']. ': '. curl_error($curl));
+                               if(!$keepalive)
+                               {
+                                       curl_close($curl);
+                               }
                        }
                        else
                        {
-                               curl_close($curl);
-                               $resp = $msg->parseResponse($result);
+                               if(!$keepalive)
+                               {
+                                       curl_close($curl);
+                               }
+                               $resp =& $msg->parseResponse($result, true, $this->return_type);
                        }
                        return $resp;
                }
 
-               function multicall($msgs, $timeout=0, $method='http')
-               {
-                       $results = false;
-
-                       if (! $this->no_multicall)
+               /**
+               * Send an array of request messages and return an array of responses.
+               * Unless $this->no_multicall has been set to true, it will try first
+               * to use one single xmlrpc call to server method system.multicall, and
+               * revert to sending many successive calls in case of failure.
+               * This failure is also stored in $this->no_multicall for subsequent calls.
+               * Unfortunately, there is no server error code universally used to denote
+               * the fact that multicall is unsupported, so there is no way to reliably
+               * distinguish between that and a temporary failure.
+               * If you are sure that server supports multicall and do not want to
+               * fallback to using many single calls, set the fourth parameter to FALSE.
+               *
+               * NB: trying to shoehorn extra functionality into existing syntax has resulted
+               * in pretty much convoluted code...
+               *
+               * @param array $msgs an array of xmlrpcmsg objects
+               * @param integer $timeout connection timeout (in seconds)
+               * @param string $method the http protocol variant to be used
+               * @param boolean fallback When true, upon receiveing an error during multicall, multiple single calls will be attempted
+               * @return array
+               * @access public
+               */
+               function multicall($msgs, $timeout=0, $method='', $fallback=true)
+               {
+                       if ($method == '')
+                       {
+                               $method = $this->method;
+                       }
+                       if(!$this->no_multicall)
                        {
                                $results = $this->_try_multicall($msgs, $timeout, $method);
-                               /* TODO - this is not php3-friendly */
-                               // if($results !== false)
                                if(is_array($results))
                                {
-                                       // Either the system.multicall succeeded, or the send
-                                       // failed (e.g. due to HTTP timeout). In either case,
-                                       // we're done for now.
+                                       // System.multicall succeeded
                                        return $results;
                                }
                                else
                                {
-                                       // system.multicall unsupported by server,
-                                       // don't try it next time...
-                                       $this->no_multicall = true;
+                                       // either system.multicall is unsupported by server,
+                                       // or call failed for some other reason.
+                                       if ($fallback)
+                                       {
+                                               // Don't try it next time...
+                                               $this->no_multicall = true;
+                                       }
+                                       else
+                                       {
+                                               if (is_a($results, 'xmlrpcresp'))
+                                               {
+                                                       $result = $results;
+                                               }
+                                               else
+                                               {
+                                                       $result =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['multicall_error'], $GLOBALS['xmlrpcstr']['multicall_error']);
+                                               }
+                                       }
                                }
                        }
+                       else
+                       {
+                               // override fallback, in case careless user tries to do two
+                               // opposite things at the same time
+                               $fallback = true;
+                       }
 
-                       // system.multicall is unupported by server:
-                       //   Emulate multicall via multiple requests
                        $results = array();
-                       //foreach($msgs as $msg)
-                       @reset($msgs);
-                       while(list(,$msg) = @each($msgs))
+                       if ($fallback)
+                       {
+                               // system.multicall is (probably) unsupported by server:
+                               // emulate multicall via multiple requests
+                               foreach($msgs as $msg)
+                               {
+                                       $results[] =& $this->send($msg, $timeout, $method);
+                               }
+                       }
+                       else
                        {
-                               $results[] = $this->send($msg, $timeout, $method);
+                               // user does NOT want to fallback on many single calls:
+                               // since we should always return an array of responses,
+                               // return an array with the same error repeated n times
+                               foreach($msgs as $msg)
+                               {
+                                       $results[] = $result;
+                               }
                        }
                        return $results;
                }
 
-               // Attempt to boxcar $msgs via system.multicall.
+               /**
+               * Attempt to boxcar $msgs via system.multicall.
+               * Returns either an array of xmlrpcreponses, an xmlrpc error response
+               * or false (when received response does not respect valid multicall syntax)
+               * @access private
+               */
                function _try_multicall($msgs, $timeout, $method)
                {
                        // Construct multicall message
                        $calls = array();
-                       //foreach($msgs as $msg)
-                       @reset($msgs);
-                       while(list(,$msg) = @each($msgs))
+                       foreach($msgs as $msg)
                        {
-                               $call['methodName'] = new xmlrpcval($msg->method(),'string');
+                               $call['methodName'] =& new xmlrpcval($msg->method(),'string');
                                $numParams = $msg->getNumParams();
                                $params = array();
-                               for ($i = 0; $i < $numParams; $i++)
+                               for($i = 0; $i < $numParams; $i++)
                                {
                                        $params[$i] = $msg->getParam($i);
                                }
-                               $call['params'] = new xmlrpcval($params, 'array');
-                               $calls[] = new xmlrpcval($call, 'struct');
+                               $call['params'] =& new xmlrpcval($params, 'array');
+                               $calls[] =& new xmlrpcval($call, 'struct');
                        }
-                       $multicall = new xmlrpcmsg('system.multicall');
+                       $multicall =& new xmlrpcmsg('system.multicall');
                        $multicall->addParam(new xmlrpcval($calls, 'array'));
 
                        // Attempt RPC call
-                       $result = $this->send($multicall, $timeout, $method);
-                       if(!is_object($result))
-                       {
-                               return ($result || 0); // transport failed
-                       }
+                       $result =& $this->send($multicall, $timeout, $method);
 
                        if($result->faultCode() != 0)
                        {
-                               return false;           // system.multicall failed
+                               // call to system.multicall failed
+                               return $result;
                        }
 
                        // Unpack responses.
                        $rets = $result->value();
-                       if($rets->kindOf() != 'array')
+
+                       if ($this->return_type == 'xml')
                        {
-                               return false;           // bad return type from system.multicall
+                                       return $rets;
                        }
-                       $numRets = $rets->arraysize();
-                       if($numRets != count($msgs))
+                       else if ($this->return_type == 'phpvals')
                        {
-                               return false;           // wrong number of return values.
-                       }
+                               ///@todo test this code branch...
+                               $rets = $result->value();
+                               if(!is_array($rets))
+                               {
+                                       return false;           // bad return type from system.multicall
+                               }
+                               $numRets = count($rets);
+                               if($numRets != count($msgs))
+                               {
+                                       return false;           // wrong number of return values.
+                               }
 
-                       $response = array();
-                       for ($i = 0; $i < $numRets; $i++)
-                       {
-                               $val = $rets->arraymem($i);
-                               switch ($val->kindOf())
+                               $response = array();
+                               for($i = 0; $i < $numRets; $i++)
                                {
-                               case 'array':
-                                       if($val->arraysize() != 1)
-                                       {
-                                               return false;           // Bad value
+                                       $val = $rets[$i];
+                                       if (!is_array($val)) {
+                                               return false;
                                        }
-                                       // Normal return value
-                                       $response[$i] = new xmlrpcresp($val->arraymem(0));
-                                       break;
-                               case 'struct':
-                                       $code = $val->structmem('faultCode');
-                                       if($code->kindOf() != 'scalar' || $code->scalartyp() != 'int')
+                                       switch(count($val))
                                        {
-                                               return false;
+                                               case 1:
+                                                       if(!isset($val[0]))
+                                                       {
+                                                               return false;           // Bad value
+                                                       }
+                                                       // Normal return value
+                                                       $response[$i] =& new xmlrpcresp($val[0], 0, '', 'phpvals');
+                                                       break;
+                                               case 2:
+                                                       ///     @todo remove usage of @: it is apparently quite slow
+                                                       $code = @$val['faultCode'];
+                                                       if(!is_int($code))
+                                                       {
+                                                               return false;
+                                                       }
+                                                       $str = @$val['faultString'];
+                                                       if(!is_string($str))
+                                                       {
+                                                               return false;
+                                                       }
+                                                       $response[$i] =& new xmlrpcresp(0, $code, $str);
+                                                       break;
+                                               default:
+                                                       return false;
                                        }
-                                       $str = $val->structmem('faultString');
-                                       if($str->kindOf() != 'scalar' || $str->scalartyp() != 'string')
+                               }
+                               return $response;
+                       }
+                       else // return type == 'xmlrpcvals'
+                       {
+                               $rets = $result->value();
+                               if($rets->kindOf() != 'array')
+                               {
+                                       return false;           // bad return type from system.multicall
+                               }
+                               $numRets = $rets->arraysize();
+                               if($numRets != count($msgs))
+                               {
+                                       return false;           // wrong number of return values.
+                               }
+
+                               $response = array();
+                               for($i = 0; $i < $numRets; $i++)
+                               {
+                                       $val = $rets->arraymem($i);
+                                       switch($val->kindOf())
                                        {
-                                               return false;
+                                               case 'array':
+                                                       if($val->arraysize() != 1)
+                                                       {
+                                                               return false;           // Bad value
+                                                       }
+                                                       // Normal return value
+                                                       $response[$i] =& new xmlrpcresp($val->arraymem(0));
+                                                       break;
+                                               case 'struct':
+                                                       $code = $val->structmem('faultCode');
+                                                       if($code->kindOf() != 'scalar' || $code->scalartyp() != 'int')
+                                                       {
+                                                               return false;
+                                                       }
+                                                       $str = $val->structmem('faultString');
+                                                       if($str->kindOf() != 'scalar' || $str->scalartyp() != 'string')
+                                                       {
+                                                               return false;
+                                                       }
+                                                       $response[$i] =& new xmlrpcresp(0, $code->scalarval(), $str->scalarval());
+                                                       break;
+                                               default:
+                                                       return false;
                                        }
-                                       $response[$i] = new xmlrpcresp(0, $code->scalarval(), $str->scalarval());
-                                       break;
-                               default:
-                                       return false;
                                }
+                               return $response;
                        }
-                       return $response;
                }
        } // end class xmlrpc_client
 
        class xmlrpcresp
        {
                var $val = 0;
+               var $valtyp;
                var $errno = 0;
                var $errstr = '';
+               var $payload;
                var $hdrs = array();
-
-               function xmlrpcresp($val, $fcode = 0, $fstr = '')
-               {
-                       if ($fcode != 0)
-                       {
-                               // error
+               var $_cookies = array();
+               var $content_type = 'text/xml';
+               var $raw_data = '';
+
+               /**
+               * @param mixed $val either an xmlrpcval obj, a php value or the xml serialization of an xmlrpcval (a string)
+               * @param integer $fcode set it to anything but 0 to create an error response
+               * @param string $fstr the error string, in case of an error response
+               * @param string $valtyp either 'xmlrpcvals', 'phpvals' or 'xml'
+               *
+               * @todo add check that $val / $fcode / $fstr is of correct type???
+               * NB: as of now we do not do it, since it might be either an xmlrpcval or a plain
+               * php val, or a complete xml chunk, depending on usage of xmlrpc_client::send() inside which creator is called...
+               */
+               function xmlrpcresp($val, $fcode = 0, $fstr = '', $valtyp='')
+               {
+                       if($fcode != 0)
+                       {
+                               // error response
                                $this->errno = $fcode;
                                $this->errstr = $fstr;
                                //$this->errstr = htmlspecialchars($fstr); // XXX: encoding probably shouldn't be done here; fix later.
                        }
-                       elseif (!is_object($val))
-                       {
-                               // programmer error
-                               error_log("Invalid type '" . gettype($val) . "' (value: $val) passed to xmlrpcresp. Defaulting to empty value.");
-                               $this->val = new xmlrpcval();
-                       }
                        else
                        {
-                               // success
+                               // successful response
                                $this->val = $val;
+                               if ($valtyp == '')
+                               {
+                                       // user did not declare type of response value: try to guess it
+                                       if (is_object($this->val) && is_a($this->val, 'xmlrpcval'))
+                                       {
+                                               $this->valtyp = 'xmlrpcvals';
+                                       }
+                                       else if (is_string($this->val))
+                                       {
+                                               $this->valtyp = 'xml';
+
+                                       }
+                                       else
+                                       {
+                                               $this->valtyp = 'phpvals';
+                                       }
+                               }
+                               else
+                               {
+                                       // user declares type of resp value: believe him
+                                       $this->valtyp = $valtyp;
+                               }
                        }
                }
 
+               /**
+               * Returns the error code of the response.
+               * @return integer the error code of this response (0 for not-error responses)
+               * @access public
+               */
                function faultCode()
                {
                        return $this->errno;
                }
 
+               /**
+               * Returns the error code of the response.
+               * @return string the error string of this response ('' for not-error responses)
+               * @access public
+               */
                function faultString()
                {
                        return $this->errstr;
                }
 
+               /**
+               * Returns the value received by the server.
+               * @return mixed the xmlrpcval object returned by the server. Might be an xml string or php value if the response has been created by specially configured xmlrpc_client objects
+               * @access public
+               */
                function value()
                {
                        return $this->val;
                }
 
-               function serialize()
+               /**
+               * Returns an array with the cookies received from the server.
+               * Array has the form: $cookiename => array ('value' => $val, $attr1 => $val1, $attr2 = $val2, ...)
+               * with attributes being e.g. 'expires', 'path', domain'.
+               * NB: cookies sent as 'expired' by the server (i.e. with an expiry date in the past)
+               * are still present in the array. It is up to the user-defined code to decide
+               * how to use the received cookies, and wheter they have to be sent back with the next
+               * request to the server (using xmlrpc_client::setCookie) or not
+               * @return array array of cookies received from the server
+               * @access public
+               */
+               function cookies()
+               {
+                       return $this->_cookies;
+               }
+
+               /**
+               * Returns xml representation of the response. XML prologue not included
+               * @param string $charset_encoding the charset to be used for serialization. if null, US-ASCII is assumed
+               * @return string the xml representation of the response
+               * @access public
+               */
+               function serialize($charset_encoding='')
                {
+                       if ($charset_encoding != '')
+                               $this->content_type = 'text/xml; charset=' . $charset_encoding;
+                       else
+                               $this->content_type = 'text/xml';
                        $result = "<methodResponse>\n";
-                       if ($this->errno)
+                       if($this->errno)
                        {
                                // G. Giunta 2005/2/13: let non-ASCII response messages be tolerated by clients
-                               $result .= '<fault>
-<value>
-<struct>
-<member>
-<name>faultCode</name>
-<value><int>' . $this->errno . '</int></value>
-</member>
-<member>
-<name>faultString</name>
-<value><string>' . xmlrpc_encode_entitites($this->errstr) . '</string></value>
-</member>
-</struct>
-</value>
-</fault>';
+                               // by xml-encoding non ascii chars
+                               $result .= "<fault>\n" .
+"<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .
+"</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
+xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding) . "</string></value>\n</member>\n" .
+"</struct>\n</value>\n</fault>";
                        }
                        else
                        {
-                               $result .= "<params>\n<param>\n" .
-                                       $this->val->serialize() . 
-                                       "</param>\n</params>";
+                               if(!is_object($this->val) || !is_a($this->val, 'xmlrpcval'))
+                               {
+                                       if (is_string($this->val) && $this->valtyp == 'xml')
+                                       {
+                                               $result .= "<params>\n<param>\n" .
+                                                       $this->val .
+                                                       "</param>\n</params>";
+                                       }
+                                       else
+                                       {
+                                               /// @todo try to build something serializable?
+                                               die('cannot serialize xmlrpcresp objects whose content is native php values');
+                                       }
+                               }
+                               else
+                               {
+                                       $result .= "<params>\n<param>\n" .
+                                               $this->val->serialize($charset_encoding) .
+                                               "</param>\n</params>";
+                               }
                        }
                        $result .= "\n</methodResponse>";
+                       $this->payload = $result;
                        return $result;
                }
        }
                var $methodname;
                var $params=array();
                var $debug=0;
+               var $content_type = 'text/xml';
 
+               /**
+               * @param string $meth the name of the method to invoke
+               * @param array $pars array of parameters to be paased to the method (xmlrpcval objects)
+               */
                function xmlrpcmsg($meth, $pars=0)
                {
                        $this->methodname=$meth;
-                       if (is_array($pars) && sizeof($pars)>0)
+                       if(is_array($pars) && count($pars)>0)
                        {
-                               for($i=0; $i<sizeof($pars); $i++)
+                               for($i=0; $i<count($pars); $i++)
                                {
                                        $this->addParam($pars[$i]);
                                }
                        }
                }
 
-               function xml_header()
+               /**
+               * @access private
+               */
+               function xml_header($charset_encoding='')
                {
-                       return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
+                       if ($charset_encoding != '')
+                       {
+                               return "<?xml version=\"1.0\" encoding=\"$charset_encoding\" ?" . ">\n<methodCall>\n";
+                       }
+                       else
+                       {
+                               return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
+                       }
                }
 
+               /**
+               * @access private
+               */
                function xml_footer()
                {
-                       return "</methodCall>\n";
+                       return '</methodCall>';
                }
 
-               function createPayload()
+               /**
+               * @access private
+               */
+               function kindOf()
+               {
+                       return 'msg';
+               }
+
+               /**
+               * @access private
+               */
+               function createPayload($charset_encoding='')
                {
-                       $this->payload=$this->xml_header();
+                       if ($charset_encoding != '')
+                               $this->content_type = 'text/xml; charset=' . $charset_encoding;
+                       else
+                               $this->content_type = 'text/xml';
+                       $this->payload=$this->xml_header($charset_encoding);
                        $this->payload.='<methodName>' . $this->methodname . "</methodName>\n";
-                       //      if (sizeof($this->params)) {
                        $this->payload.="<params>\n";
-                       for($i=0; $i<sizeof($this->params); $i++)
+                       for($i=0; $i<count($this->params); $i++)
                        {
                                $p=$this->params[$i];
-                               $this->payload.="<param>\n" . $p->serialize() .
+                               $this->payload.="<param>\n" . $p->serialize($charset_encoding) .
                                "</param>\n";
                        }
                        $this->payload.="</params>\n";
-                       // }
                        $this->payload.=$this->xml_footer();
-                       //$this->payload=str_replace("\n", "\r\n", $this->payload);
                }
 
+               /**
+               * Gets/sets the xmlrpc method to be invoked
+               * @param string $meth the method to be set (leave empty not to set it)
+               * @return string the method that will be invoked
+               * @access public
+               */
                function method($meth='')
                {
-                       if ($meth!='')
+                       if($meth!='')
                        {
                                $this->methodname=$meth;
                        }
                        return $this->methodname;
                }
 
-               function serialize()
+               /**
+               * Returns xml representation of the message. XML prologue included
+               * @return string the xml representation of the message, xml prologue included
+               * @access public
+               */
+               function serialize($charset_encoding='')
                {
-                       $this->createPayload();
+                       $this->createPayload($charset_encoding);
                        return $this->payload;
                }
 
-               function addParam($par) { $this->params[]=$par; }
+               /**
+               * Add a parameter to the list of parameters to be used upon method invocation
+               * @param xmlrpcval $par
+               * @return boolean false on failure
+               * @access public
+               */
+               function addParam($par)
+               {
+                       // add check: do not add to self params which are not xmlrpcvals
+                       if(is_object($par) && is_a($par, 'xmlrpcval'))
+                       {
+                               $this->params[]=$par;
+                               return true;
+                       }
+                       else
+                       {
+                               return false;
+                       }
+               }
+
+               /**
+               * Returns the nth parameter in the message. The index zero-based.
+               * @param integer $i the index of the parameter to fetch (zero based)
+               * @return xmlrpcval the i-th parameter
+               * @access public
+               */
                function getParam($i) { return $this->params[$i]; }
-               function getNumParams() { return sizeof($this->params); }
 
-               function parseResponseFile($fp)
+               /**
+               * Returns the number of parameters in the messge.
+               * @return integer the number of parameters currently set
+               * @access public
+               */
+               function getNumParams() { return count($this->params); }
+
+               /**
+               * Given an open file handle, read all data available and parse it as axmlrpc response.
+               * NB: the file handle is not closed by this function.
+               * @access public
+               * @return xmlrpcresp
+               * @todo add 2nd & 3rd param to be passed to ParseResponse() ???
+               */
+               function &parseResponseFile($fp)
                {
                        $ipd='';
                        while($data=fread($fp, 32768))
                        {
                                $ipd.=$data;
                        }
-                       return $this->parseResponse($ipd);
+                       //fclose($fp);
+                       $r =& $this->parseResponse($ipd);
+                       return $r;
                }
 
-               function parseResponse($data='')
+               /**
+               * Parses HTTP headers and separates them from data.
+               * @access private
+               */
+               function &parseResponseHeaders(&$data, $headers_processed=false)
                {
-                       global $_xh,$xmlrpcerr,$xmlrpcstr;
-                       global $xmlrpc_defencoding, $xmlrpc_internalencoding;
-
-                       $hdrfnd = 0;
-                       if($this->debug)
-                       {
-                               //by maHo, replaced htmlspecialchars with htmlentities
-                               print "<PRE>---GOT---\n" . htmlentities($data) . "\n---END---\n</PRE>";
-                       }
+                               // Support "web-proxy-tunelling" connections for https through proxies
+                               if(preg_match('/^HTTP\/1\.[0-1] 200 Connection established/', $data))
+                               {
+                                       // Look for CR/LF or simple LF as line separator,
+                                       // (even though it is not valid http)
+                                       $pos = strpos($data,"\r\n\r\n");
+                                       if($pos || is_int($pos))
+                                       {
+                                               $bd = $pos+4;
+                                       }
+                                       else
+                                       {
+                                               $pos = strpos($data,"\n\n");
+                                               if($pos || is_int($pos))
+                                               {
+                                                       $bd = $pos+2;
+                                               }
+                                               else
+                                               {
+                                                       // No separation between response headers and body: fault?
+                                                       $bd = 0;
+                                               }
+                                       }
+                                       if ($bd)
+                                       {
+                                               // this filters out all http headers from proxy.
+                                               // maybe we could take them into account, too?
+                                               $data = substr($data, $bd);
+                                       }
+                                       else
+                                       {
+                                               error_log('XML-RPC: xmlrpcmsg::parseResponse: HTTPS via proxy error, tunnel connection possibly failed');
+                                               $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (HTTPS via proxy error, tunnel connection possibly failed)');
+                                               return $r;
+                                       }
+                               }
 
-                       if($data == '')
-                       {
-                               error_log('No response received from server.');
-                               $r = new xmlrpcresp(0, $xmlrpcerr['no_data'], $xmlrpcstr['no_data']);
-                               return $r;
-                       }
-                       // see if we got an HTTP 200 OK, else bomb
-                       // but only do this if we're using the HTTP protocol.
-                       if(ereg("^HTTP",$data))
-                       {
                                // Strip HTTP 1.1 100 Continue header if present
-                               while (ereg('^HTTP/1.1 1[0-9]{2}', $data))
+                               while(preg_match('/^HTTP\/1\.1 1[0-9]{2} /', $data))
                                {
                                        $pos = strpos($data, 'HTTP', 12);
                                        // server sent a Continue header without any (valid) content following...
                                        // give the client a chance to know it
-                                       if (!$pos && !is_int($pos)) // works fine in php 3, 4 and 5
+                                       if(!$pos && !is_int($pos)) // works fine in php 3, 4 and 5
+                                       {
                                                break;
+                                       }
                                        $data = substr($data, $pos);
                                }
-                               if (!ereg("^HTTP/[0-9\\.]+ 200 ", $data))
+                               if(!preg_match('/^HTTP\/[0-9.]+ 200 /', $data))
                                {
                                        $errstr= substr($data, 0, strpos($data, "\n")-1);
-                                       error_log('HTTP error, got response: ' .$errstr);
-                                       $r=new xmlrpcresp(0, $xmlrpcerr['http_error'], $xmlrpcstr['http_error']. ' (' . $errstr . ')');
+                                       error_log('XML-RPC: xmlrpcmsg::parseResponse: HTTP error, got response: ' .$errstr);
+                                       $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (' . $errstr . ')');
                                        return $r;
                                }
-                       }
-                       $parser = xml_parser_create($xmlrpc_defencoding);
 
-                       // G. Giunta 2004/04/06
-                       // Clean up the accumulator, or it will grow indefinitely long
-                       // if making xmlrpc calls for a while
-                       $_xh=array();
-                       $_xh[$parser]=array();
-                       $_xh[$parser]['headers'] = array();
-                       $_xh[$parser]['stack'] = array();
-                       $_xh[$parser]['sp'] = 0;
-                       $_xh[$parser]['valuestack'] = array();
-                       $_xh[$parser]['vsp'] = 0;
+                               $GLOBALS['_xh']['headers'] = array();
+                               $GLOBALS['_xh']['cookies'] = array();
 
-                       // separate HTTP headers from data
-                       if (ereg("^HTTP", $data))
-                       {
                                // be tolerant to usage of \n instead of \r\n to separate headers and data
                                // (even though it is not valid http)
                                $pos = strpos($data,"\r\n\r\n");
                                if($pos || is_int($pos))
+                               {
                                        $bd = $pos+4;
+                               }
                                else
                                {
                                        $pos = strpos($data,"\n\n");
                                        if($pos || is_int($pos))
+                                       {
                                                $bd = $pos+2;
+                                       }
                                        else
                                        {
                                                // No separation between response headers and body: fault?
+                                               // we could take some action here instead of going on...
                                                $bd = 0;
                                        }
                                }
                                // be tolerant to line endings, and extra empty lines
                                $ar = split("\r?\n", trim(substr($data, 0, $pos)));
-                               while (list(,$line) = @each($ar))
+                               while(list(,$line) = @each($ar))
                                {
-                                       // take care of multi-line headers
-                                       $arr = explode(':',$line);
+                                       // take care of multi-line headers and cookies
+                                       $arr = explode(':',$line,2);
                                        if(count($arr) > 1)
                                        {
-                                               $header_name = trim($arr[0]);
-                                               // TO DO: some headers (the ones that allow a CSV list of values)
-                                               // do allow many values to be passed using multiple header lines.
-                                               // We should add content to $_xh[$parser]['headers'][$header_name]
-                                               // instead of replacing it for those...
-                                               $_xh[$parser]['headers'][$header_name] = $arr[1];
-                                               for ($i = 2; $i < count($arr); $i++)
+                                               $header_name = strtolower(trim($arr[0]));
+                                               /// @todo some other headers (the ones that allow a CSV list of values)
+                                               /// do allow many values to be passed using multiple header lines.
+                                               /// We should add content to $GLOBALS['_xh']['headers'][$header_name]
+                                               /// instead of replacing it for those...
+                                               if ($header_name == 'set-cookie' || $header_name == 'set-cookie2')
                                                {
-                                                       $_xh[$parser]['headers'][$header_name] .= ':'.$arr[$i];
-                                               } // while
-                                               $_xh[$parser]['headers'][$header_name] = trim($_xh[$parser]['headers'][$header_name]);
-                                       } else if (isset($header_name))
+                                                       if ($header_name == 'set-cookie2')
+                                                       {
+                                                               // version 2 cookies:
+                                                               // there could be many cookies on one line, comma separated
+                                                               $cookies = explode(',', $arr[1]);
+                                                       }
+                                                       else
+                                                       {
+                                                               $cookies = array($arr[1]);
+                                                       }
+                                                       foreach ($cookies as $cookie)
+                                                       {
+                                                               // glue together all received cookies, using a comma to separate them
+                                                               // (same as php does with getallheaders())
+                                                               if (isset($GLOBALS['_xh']['headers'][$header_name]))
+                                                                       $GLOBALS['_xh']['headers'][$header_name] .= ', ' . trim($cookie);
+                                                               else
+                                                                       $GLOBALS['_xh']['headers'][$header_name] = trim($cookie);
+                                                               // parse cookie attributes, in case user wants to correctly honour them
+                                                               // feature creep: only allow rfc-compliant cookie attributes?
+                                                               $cookie = explode(';', $cookie);
+                                                               foreach ($cookie as $pos => $val)
+                                                               {
+                                                                       $val = explode('=', $val, 2);
+                                                                       $tag = trim($val[0]);
+                                                                       $val = trim(@$val[1]);
+                                                                       /// @todo with version 1 cookies, we should strip leading and trailing " chars
+                                                                       if ($pos == 0)
+                                                                       {
+                                                                               $cookiename = $tag;
+                                                                               $GLOBALS['_xh']['cookies'][$tag] = array();
+                                                                               $GLOBALS['_xh']['cookies'][$cookiename]['value'] = urldecode($val);
+                                                                       }
+                                                                       else
+                                                                       {
+                                                                               $GLOBALS['_xh']['cookies'][$cookiename][$tag] = $val;
+                                                                       }
+                                                               }
+                                                       }
+                                               }
+                                               else
+                                               {
+                                                       $GLOBALS['_xh']['headers'][$header_name] = trim($arr[1]);
+                                               }
+                                       }
+                                       elseif(isset($header_name))
                                        {
-                                               $_xh[$parser]['headers'][$header_name] .= ' ' . trim($line);
+                                               ///     @todo version1 cookies might span multiple lines, thus breaking the parsing above
+                                               $GLOBALS['_xh']['headers'][$header_name] .= ' ' . trim($line);
                                        }
                                }
+
                                $data = substr($data, $bd);
 
-                               if ($this->debug && count($_xh[$parser]['headers']))
+                               if($this->debug && count($GLOBALS['_xh']['headers']))
                                {
                                        print '<PRE>';
-                                       //foreach ($_xh[$parser]['headers'] as $header)
-                                       @reset($_xh[$parser]['headers']);
-                                       while(list($header, $value) = @each($_xh[$parser]['headers']))
+                                       foreach($GLOBALS['_xh']['headers'] as $header => $value)
+                                       {
+                                               print htmlentities("HEADER: $header: $value\n");
+                                       }
+                                       foreach($GLOBALS['_xh']['cookies'] as $header => $value)
                                        {
-                                               print "HEADER: $header: $value\n";
+                                               print htmlentities("COOKIE: $header={$value['value']}\n");
                                        }
                                        print "</PRE>\n";
                                }
+
+                               // if CURL was used for the call, http headers have been processed,
+                               // and dechunking + reinflating have been carried out
+                               if(!$headers_processed)
+                               {
+                                       // Decode chunked encoding sent by http 1.1 servers
+                                       if(isset($GLOBALS['_xh']['headers']['transfer-encoding']) && $GLOBALS['_xh']['headers']['transfer-encoding'] == 'chunked')
+                                       {
+                                               if(!$data = decode_chunked($data))
+                                               {
+                                                       error_log('XML-RPC: xmlrpcmsg::parseResponse: errors occurred when trying to rebuild the chunked data received from server');
+                                                       $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['dechunk_fail'], $GLOBALS['xmlrpcstr']['dechunk_fail']);
+                                                       return $r;
+                                               }
+                                       }
+
+                                       // Decode gzip-compressed stuff
+                                       // code shamelessly inspired from nusoap library by Dietrich Ayala
+                                       if(isset($GLOBALS['_xh']['headers']['content-encoding']))
+                                       {
+                                               $GLOBALS['_xh']['headers']['content-encoding'] = str_replace('x-', '', $GLOBALS['_xh']['headers']['content-encoding']);
+                                               if($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' || $GLOBALS['_xh']['headers']['content-encoding'] == 'gzip')
+                                               {
+                                                       // if decoding works, use it. else assume data wasn't gzencoded
+                                                       if(function_exists('gzinflate'))
+                                                       {
+                                                               if($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data))
+                                                               {
+                                                                       $data = $degzdata;
+                                                                       if($this->debug)
+                                                                       print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";
+                                                               }
+                                                               elseif($GLOBALS['_xh']['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))
+                                                               {
+                                                                       $data = $degzdata;
+                                                                       if($this->debug)
+                                                                       print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";
+                                                               }
+                                                               else
+                                                               {
+                                                                       error_log('XML-RPC: xmlrpcmsg::parseResponse: errors occurred when trying to decode the deflated data received from server');
+                                                                       $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['decompress_fail'], $GLOBALS['xmlrpcstr']['decompress_fail']);
+                                                                       return $r;
+                                                               }
+                                                       }
+                                                       else
+                                                       {
+                                                               error_log('XML-RPC: xmlrpcmsg::parseResponse: the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
+                                                               $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['cannot_decompress'], $GLOBALS['xmlrpcstr']['cannot_decompress']);
+                                                               return $r;
+                                                       }
+                                               }
+                                       }
+                               } // end of 'if needed, de-chunk, re-inflate response'
+
+                               // real stupid hack to avoid PHP 4 complaining about returning NULL by ref
+                               $r = null;
+                               $r =& $r;
+                               return $r;
+               }
+
+               /**
+               * Parse the xmlrpc response contained in the string $data and return an xmlrpcresp object.
+               * @param string $data the xmlrpc response, eventually including http headers
+               * @param bool $headers_processed when true prevents parsing HTTP headers for interpretation of content-encoding and consequent decoding
+               * @param string $return_type decides return type, i.e. content of response->value(). Either 'xmlrpcvals', 'xml' or 'phpvals'
+               * @return xmlrpcresp
+               * @access public
+               */
+               function &parseResponse($data='', $headers_processed=false, $return_type='xmlrpcvals')
+               {
+                       if($this->debug)
+                       {
+                               //by maHo, replaced htmlspecialchars with htmlentities
+                               print "<PRE>---GOT---\n" . htmlentities($data) . "\n---END---\n</PRE>";
+                       }
+
+                       if($data == '')
+                       {
+                               error_log('XML-RPC: xmlrpcmsg::parseResponse: no response received from server.');
+                               $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_data'], $GLOBALS['xmlrpcstr']['no_data']);
+                               return $r;
+                       }
+
+                       $GLOBALS['_xh']=array();
+
+                       $raw_data = $data;
+                       // parse the HTTP headers of the response, if present, and separate them from data
+                       if(substr($data, 0, 4) == 'HTTP')
+                       {
+                               $r =& $this->parseResponseHeaders($data, $headers_processed);
+                               if ($r)
+                               {
+                                       // failed processing of HTTP response headers
+                                       // save into response obj the full payload received, for debugging
+                                       $r->raw_data = $data;
+                                       return $r;
+                               }
+                       }
+                       else
+                       {
+                               $GLOBALS['_xh']['headers'] = array();
+                               $GLOBALS['_xh']['cookies'] = array();
+                       }
+
+                       if($this->debug)
+                       {
+                               $start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
+                               if ($start)
+                               {
+                                       $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
+                                       $end = strpos($data, '-->', $start);
+                                       $comments = substr($data, $start, $end-$start);
+                                       print "<PRE>---SERVER DEBUG INFO (DECODED) ---\n\t".htmlentities(str_replace("\n", "\n\t", base64_decode($comments)))."\n---END---\n</PRE>";
+                               }
                        }
 
                        // be tolerant of extra whitespace in response body
                        $data = trim($data);
 
-                       // be tolerant of junk after methodResponse (e.g. javascript automatically inserted by free hosts)
+                       /// @todo return an error msg if $data=='' ?
+
+                       // be tolerant of junk after methodResponse (e.g. javascript ads automatically inserted by free hosts)
                        // idea from Luca Mariano <luca.mariano@email.it> originally in PEARified version of the lib
                        $bd = false;
-                       $pos = strpos($data, "</methodResponse>");
-                       while ($pos || is_int($pos))
+                       // Poor man's version of strrpos for php 4...
+                       $pos = strpos($data, '</methodResponse>');
+                       while($pos || is_int($pos))
                        {
                                $bd = $pos+17;
-                               $pos = strpos($data, "</methodResponse>", $bd);
+                               $pos = strpos($data, '</methodResponse>', $bd);
                        }
-                       if ($bd)
+                       if($bd)
+                       {
                                $data = substr($data, 0, $bd);
+                       }
+
+                       // if user wants back raw xml, give it to him
+                       if ($return_type == 'xml')
+                       {
+                               $r =& new xmlrpcresp($data, 0, '', 'xml');
+                               $r->hdrs = $GLOBALS['_xh']['headers'];
+                               $r->_cookies = $GLOBALS['_xh']['cookies'];
+                               $r->raw_data = $raw_data;
+                               return $r;
+                       }
+
+                       // try to 'guestimate' the character encoding of the received response
+                       $resp_encoding = guess_encoding(@$GLOBALS['_xh']['headers']['content-type'], $data);
 
-                       //$_xh[$parser]['st']='';
-                       //$_xh[$parser]['cm']=0;
-                       $_xh[$parser]['isf']=0;
-                       $_xh[$parser]['isf_reason']=0;
-                       $_xh[$parser]['ac']='';
-                       //$_xh[$parser]['qt']='';
+                       $GLOBALS['_xh']['ac']='';
+                       //$GLOBALS['_xh']['qt']=''; //unused...
+                       $GLOBALS['_xh']['stack'] = array();
+                       $GLOBALS['_xh']['valuestack'] = array();
+                       $GLOBALS['_xh']['isf']=0; // 0 = OK, 1 for xmlrpc fault responses, 2 = invalid xmlrpc
+                       $GLOBALS['_xh']['isf_reason']='';
+                       $GLOBALS['_xh']['rt']=''; // 'methodcall or 'methodresponse'
 
+                       // if response charset encoding is not known / supported, try to use
+                       // the default encoding and parse the xml anyway, but log a warning...
+                       if (!in_array($resp_encoding, array('UTF-8', 'ISO-8859-1', 'US-ASCII')))
+                       // the following code might be better for mb_string enabled installs, but
+                       // makes the lib about 200% slower...
+                       //if (!is_valid_charset($resp_encoding, array('UTF-8', 'ISO-8859-1', 'US-ASCII')))
+                       {
+                               error_log('XML-RPC: xmlrpcmsg::parseResponse: invalid charset encoding of received response: '.$resp_encoding);
+                               $resp_encoding = $GLOBALS['xmlrpc_defencoding'];
+                       }
+                       $parser = xml_parser_create($resp_encoding);
                        xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);
                        // G. Giunta 2005/02/13: PHP internally uses ISO-8859-1, so we have to tell
                        // the xml parser to give us back data in the expected charset
-                       xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $xmlrpc_internalencoding);
+                       xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['xmlrpc_internalencoding']);
+
+                       if ($return_type == 'phpvals')
+                       {
+                               xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast');
+                       }
+                       else
+                       {
+                               xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee');
+                       }
 
-                       xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee');
                        xml_set_character_data_handler($parser, 'xmlrpc_cd');
                        xml_set_default_handler($parser, 'xmlrpc_dh');
-                       //$xmlrpc_value=new xmlrpcval;
 
-                       if (!xml_parse($parser, $data, sizeof($data)))
+                       // first error check: xml not well formed
+                       if(!xml_parse($parser, $data, count($data)))
                        {
                                // thanks to Peter Kocks <peter.kocks@baygate.com>
                                if((xml_get_current_line_number($parser)) == 1)
                                }
                                else
                                {
-                                       $errstr = sprintf('XML error: %s at line %d',
+                                       $errstr = sprintf('XML error: %s at line %d, column %d',
                                                xml_error_string(xml_get_error_code($parser)),
-                                               xml_get_current_line_number($parser));
+                                               xml_get_current_line_number($parser), xml_get_current_column_number($parser));
                                }
                                error_log($errstr);
-                               $r=new xmlrpcresp(0, $xmlrpcerr['invalid_return'], $xmlrpcstr['invalid_return'].' ('.$errstr.')');
+                               $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'], $GLOBALS['xmlrpcstr']['invalid_return'].' ('.$errstr.')');
                                xml_parser_free($parser);
-                               if ($this->debug)
-                                       echo $errstr;
-                               $r->hdrs = $_xh[$parser]['headers'];
+                               if($this->debug)
+                               {
+                                       print $errstr;
+                               }
+                               $r->hdrs = $GLOBALS['_xh']['headers'];
+                               $r->_cookies = $GLOBALS['_xh']['cookies'];
+                               $r->raw_data = $raw_data;
                                return $r;
                        }
                        xml_parser_free($parser);
-
-                       if ($_xh[$parser]['isf'] > 1)
+                       // second error check: xml well formed but not xml-rpc compliant
+                       if ($GLOBALS['_xh']['isf'] > 1)
                        {
-                       if ($this->debug)
-                       {
-                                       ///@todo echo something for user?
+                               if ($this->debug)
+                               {
+                                       /// @todo echo something for user?
                                }
 
-                               $r = new xmlrpcresp(0, $xmlrpcerr['invalid_return'],
-                               $xmlrpcstr['invalid_return'] . ' ' . $_xh[$parser]['isf_reason']);
+                               $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],
+                               $GLOBALS['xmlrpcstr']['invalid_return'] . ' ' . $GLOBALS['_xh']['isf_reason']);
                        }
-                       //else if (strlen($_xh[$parser]['st'])==0)
-                       else if (!is_object($_xh[$parser]['value']))
+                       // third error check: parsing of the response has somehow gone boink.
+                       // NB: shall we omit this check, since we trust the parsing code?
+                       elseif ($return_type == 'xmlrpcvals' && !is_object($GLOBALS['_xh']['value']))
                        {
-                               // then something odd has happened
+                               // something odd has happened
                                // and it's time to generate a client side error
                                // indicating something odd went on
-                               $r=new xmlrpcresp(0, $xmlrpcerr['invalid_return'],
-                               $xmlrpcstr['invalid_return']);
+                               $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],
+                                       $GLOBALS['xmlrpcstr']['invalid_return']);
                        }
                        else
                        {
-
                                if ($this->debug)
                                {
-                                       //print "<PRE>---EVALING---[" .
-                                       //strlen($_xh[$parser]['st']) . " chars]---\n" .
-                                       //htmlspecialchars($_xh[$parser]['st']) . ";\n---END---</PRE>";
-                                       print "<PRE>---PARSED---\n" ;
-                                       var_dump($_xh[$parser]['value']);
+                                       print "<PRE>---PARSED---\n";
+                                       // somehow htmlentities chokes on var_export, and some full html string...
+                                       //print htmlentitites(var_export($GLOBALS['_xh']['value'], true));
+                                       print htmlspecialchars(var_export($GLOBALS['_xh']['value'], true));
                                        print "\n---END---</PRE>";
                                }
 
-                               //$allOK=0;
-                               //@eval('$v=' . $_xh[$parser]['st'] . '; $allOK=1;');
-                               //if (!$allOK)
-                               //{
-                               //      $r = new xmlrpcresp(0, $xmlrpcerr['invalid_return'], $xmlrpcstr['invalid_return']);
-                               //}
-                               //else
-                               $v = $_xh[$parser]['value'];
-                               if ($_xh[$parser]['isf'])
+                               // note that using =& will raise an error if $GLOBALS['_xh']['st'] does not generate an object.
+                               $v =& $GLOBALS['_xh']['value'];
+
+                               if($GLOBALS['_xh']['isf'])
                                {
-                                       $errno_v = $v->structmem('faultCode');
-                                       $errstr_v = $v->structmem('faultString');
-                                       $errno = $errno_v->scalarval();
+                                       /// @todo we should test here if server sent an int and a string,
+                                       /// and/or coerce them into such...
+                                       if ($return_type == 'xmlrpcvals')
+                                       {
+                                               $errno_v = $v->structmem('faultCode');
+                                               $errstr_v = $v->structmem('faultString');
+                                               $errno = $errno_v->scalarval();
+                                               $errstr = $errstr_v->scalarval();
+                                       }
+                                       else
+                                       {
+                                               $errno = $v['faultCode'];
+                                               $errstr = $v['faultString'];
+                                       }
 
-                                       if ($errno == 0)
+                                       if($errno == 0)
                                        {
                                                // FAULT returned, errno needs to reflect that
                                                $errno = -1;
                                        }
 
-                                       $r = new xmlrpcresp($v, $errno, $errstr_v->scalarval());
+                                       $r =& new xmlrpcresp(0, $errno, $errstr);
                                }
                                else
                                {
-                                       $r=new xmlrpcresp($v);
+                                       $r=&new xmlrpcresp($v, 0, '', $return_type);
                                }
                        }
 
-                       $r->hdrs = $_xh[$parser]['headers'];
+                       $r->hdrs = $GLOBALS['_xh']['headers'];
+                       $r->_cookies = $GLOBALS['_xh']['cookies'];
+                       $r->raw_data = $raw_data;
                        return $r;
                }
        }
        {
                var $me=array();
                var $mytype=0;
+               var $_php_class=null;
 
+               /**
+               * @param mixed $val
+               * @param string $type any valid xmlrpc type name (lowercase). If null, 'string' is assumed
+               */
                function xmlrpcval($val=-1, $type='')
                {
-                       global $xmlrpcTypes;
-                       $this->me=array();
-                       $this->mytype=0;
-                       if ($val!=-1 || !is_int($val) || $type!='')
+                       /// @todo: optimization creep - do not call addXX, do it all inline.
+                       /// downside: booleans will not be coerced anymore
+                       if($val!==-1 || $type!='')
                        {
-                               if ($type=='')
+                               // optimization creep: inlined all work done by constructor
+                               switch($type)
+                               {
+                                       case '':
+                                               $this->mytype=1;
+                                               $this->me['string']=$val;
+                                               break;
+                                       case 'i4':
+                                       case 'int':
+                                       case 'double':
+                                       case 'string':
+                                       case 'boolean':
+                                       case 'dateTime.iso8601':
+                                       case 'base64':
+                                       case 'null':
+                                               $this->mytype=1;
+                                               $this->me[$type]=$val;
+                                               break;
+                                       case 'array':
+                                               $this->mytype=2;
+                                               $this->me['array']=$val;
+                                               break;
+                                       case 'struct':
+                                               $this->mytype=3;
+                                               $this->me['struct']=$val;
+                                               break;
+                                       default:
+                                               error_log("XML-RPC: xmlrpcval::xmlrpcval: not a known type ($type)");
+                               }
+                               /*if($type=='')
                                {
                                        $type='string';
                                }
-                               if ($xmlrpcTypes[$type]==1)
+                               if($GLOBALS['xmlrpcTypes'][$type]==1)
                                {
                                        $this->addScalar($val,$type);
                                }
-                               elseif ($xmlrpcTypes[$type]==2)
+                               elseif($GLOBALS['xmlrpcTypes'][$type]==2)
                                {
                                        $this->addArray($val);
                                }
-                               elseif ($xmlrpcTypes[$type]==3)
+                               elseif($GLOBALS['xmlrpcTypes'][$type]==3)
                                {
                                        $this->addStruct($val);
-                               }
+                               }*/
                        }
                }
 
+               /**
+               * Add a single php value to an (unitialized) xmlrpcval
+               * @param mixed $val
+               * @param string $type
+               * @return int 1 or 0 on failure
+               */
                function addScalar($val, $type='string')
                {
-                       global $xmlrpcTypes, $xmlrpcBoolean;
-
-                       if ($this->mytype==1)
-                       {
-                               echo '<B>xmlrpcval</B>: scalar can have only one value<BR>';
-                               return 0;
-                       }
-                       $typeof=$xmlrpcTypes[$type];
-                       if ($typeof!=1)
+                       $typeof=@$GLOBALS['xmlrpcTypes'][$type];
+                       if($typeof!=1)
                        {
-                               echo '<B>xmlrpcval</B>: not a scalar type (${typeof})<BR>';
+                               error_log("XML-RPC: xmlrpcval::addScalar: not a scalar type ($type)");
                                return 0;
                        }
 
-                       if ($type==$xmlrpcBoolean)
+                       // coerce booleans into correct values
+                       // NB: we should iether do it for datetimes, integers and doubles, too,
+                       // or just plain remove this check, implemnted on booleans only...
+                       if($type==$GLOBALS['xmlrpcBoolean'])
                        {
-                               if (strcasecmp($val,'true')==0 || $val==1 || ($val==true && strcasecmp($val,'false')))
+                               if(strcasecmp($val,'true')==0 || $val==1 || ($val==true && strcasecmp($val,'false')))
                                {
-                                       $val=1;
+                                       $val=true;
                                }
                                else
                                {
-                                       $val=0;
+                                       $val=false;
                                }
                        }
 
-                       if ($this->mytype==2)
-                       {
-                               // we're adding to an array here
-                               $ar=$this->me['array'];
-                               $ar[]=new xmlrpcval($val, $type);
-                               $this->me['array']=$ar;
-                       }
-                       else
+                       switch($this->mytype)
                        {
-                               // a scalar, so set the value and remember we're scalar
-                               $this->me[$type]=$val;
-                               $this->mytype=$typeof;
+                               case 1:
+                                       error_log('XML-RPC: xmlrpcval::addScalar: scalar xmlrpcval can have only one value');
+                                       return 0;
+                               case 3:
+                                       error_log('XML-RPC: xmlrpcval::addScalar: cannot add anonymous scalar to struct xmlrpcval');
+                                       return 0;
+                               case 2:
+                                       // we're adding a scalar value to an array here
+                                       //$ar=$this->me['array'];
+                                       //$ar[]=&new xmlrpcval($val, $type);
+                                       //$this->me['array']=$ar;
+                                       // Faster (?) avoid all the costly array-copy-by-val done here...
+                                       $this->me['array'][]=&new xmlrpcval($val, $type);
+                                       return 1;
+                               default:
+                                       // a scalar, so set the value and remember we're scalar
+                                       $this->me[$type]=$val;
+                                       $this->mytype=$typeof;
+                                       return 1;
                        }
-                       return 1;
                }
 
+               /**
+               * Add an array of xmlrpcval objects to an xmlrpcval
+               * @param array $vals
+               * @return int 1 or 0 on failure
+               * @access public
+               *
+               * @todo add some checking for $vals to be an array of xmlrpcvals?
+               */
                function addArray($vals)
                {
-                       global $xmlrpcTypes;
-                       if ($this->mytype!=0)
+                       if($this->mytype==0)
+                       {
+                               $this->mytype=$GLOBALS['xmlrpcTypes']['array'];
+                               $this->me['array']=$vals;
+                               return 1;
+                       }
+                       elseif($this->mytype==2)
+                       {
+                               // we're adding to an array here
+                               $this->me['array'] = array_merge($this->me['array'], $vals);
+                               return 1;
+                       }
+                       else
                        {
-                               echo '<B>xmlrpcval</B>: already initialized as a [' . $this->kindOf() . ']<BR>';
+                               error_log('XML-RPC: xmlrpcval::addArray: already initialized as a [' . $this->kindOf() . ']');
                                return 0;
                        }
-
-                       $this->mytype=$xmlrpcTypes['array'];
-                       $this->me['array']=$vals;
-                       return 1;
                }
 
+               /**
+               * Add an array of named xmlrpcval objects to an xmlrpcval
+               * @param array $vals
+               * @return int 1 or 0 on failure
+               * @access public
+               *
+               * @todo add some checking for $vals to be an array?
+               */
                function addStruct($vals)
                {
-                       global $xmlrpcTypes;
-                       if ($this->mytype!=0)
+                       if($this->mytype==0)
                        {
-                               echo '<B>xmlrpcval</B>: already initialized as a [' . $this->kindOf() . ']<BR>';
+                               $this->mytype=$GLOBALS['xmlrpcTypes']['struct'];
+                               $this->me['struct']=$vals;
+                               return 1;
+                       }
+                       elseif($this->mytype==3)
+                       {
+                               // we're adding to a struct here
+                               $this->me['struct'] = array_merge($this->me['struct'], $vals);
+                               return 1;
+                       }
+                       else
+                       {
+                               error_log('XML-RPC: xmlrpcval::addStruct: already initialized as a [' . $this->kindOf() . ']');
                                return 0;
                        }
-                       $this->mytype=$xmlrpcTypes['struct'];
-                       $this->me['struct']=$vals;
-                       return 1;
                }
 
+               // poor man's version of print_r ???
+               // DEPRECATED!
                function dump($ar)
                {
-                       reset($ar);
-                       while ( list( $key, $val ) = each( $ar ) )
+                       foreach($ar as $key => $val)
                        {
-                               echo "$key => $val<br>";
-                               if ($key == 'array')
+                               echo "$key => $val<br />";
+                               if($key == 'array')
                                {
-                                       while ( list( $key2, $val2 ) = each( $val ) )
+                                       while(list($key2, $val2) = each($val))
                                        {
-                                               echo "-- $key2 => $val2<br>";
+                                               echo "-- $key2 => $val2<br />";
                                        }
                                }
                        }
                }
 
+               /**
+               * Returns a string containing "struct", "array" or "scalar" describing the base type of the value
+               * @return string
+               * @access public
+               */
                function kindOf()
                {
                        switch($this->mytype)
                        }
                }
 
-               function serializedata($typ, $val)
+               /**
+               * @access private
+               */
+               function serializedata($typ, $val, $charset_encoding='')
                {
                        $rs='';
-                       global $xmlrpcTypes, $xmlrpcBase64, $xmlrpcString,
-                       $xmlrpcBoolean;
-                       switch(@$xmlrpcTypes[$typ])
+                       switch(@$GLOBALS['xmlrpcTypes'][$typ])
                        {
+                               case 1:
+                                       switch($typ)
+                                       {
+                                               case $GLOBALS['xmlrpcBase64']:
+                                                       $rs.="<${typ}>" . base64_encode($val) . "</${typ}>";
+                                                       break;
+                                               case $GLOBALS['xmlrpcBoolean']:
+                                                       $rs.="<${typ}>" . ($val ? '1' : '0') . "</${typ}>";
+                                                       break;
+                                               case $GLOBALS['xmlrpcString']:
+                                                       // G. Giunta 2005/2/13: do NOT use htmlentities, since
+                                                       // it will produce named html entities, which are invalid xml
+                                                       $rs.="<${typ}>" . xmlrpc_encode_entitites($val, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding). "</${typ}>";
+                                                       break;
+                                               case $GLOBALS['xmlrpcInt']:
+                                               case $GLOBALS['xmlrpcI4']:
+                                                       $rs.="<${typ}>".(int)$val."</${typ}>";
+                                                       break;
+                                               case $GLOBALS['xmlrpcDouble']:
+                                                       $rs.="<${typ}>".(double)$val."</${typ}>";
+                                                       break;
+                                               case $GLOBALS['xmlrpcNull']:
+                                                       $rs.="<nil/>";
+                                                       break;
+                                               default:
+                                                       // no standard type value should arrive here, but provide a possibility
+                                                       // for xmlrpcvals of unknown type...
+                                                       $rs.="<${typ}>${val}</${typ}>";
+                                       }
+                                       break;
                                case 3:
                                        // struct
-                                       $rs.="<struct>\n";
-                                       reset($val);
-                                       while(list($key2, $val2)=each($val))
+                                       if ($this->_php_class)
+                                       {
+                                               $rs.='<struct php_class="' . $this->_php_class . "\">\n";
+                                       }
+                                       else
                                        {
-                                               $rs.="<member><name>${key2}</name>\n";
-                                               $rs.=$this->serializeval($val2);
+                                               $rs.="<struct>\n";
+                                       }
+                                       foreach($val as $key2 => $val2)
+                                       {
+                                               $rs.='<member><name>'.xmlrpc_encode_entitites($key2, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding)."</name>\n";
+                                               //$rs.=$this->serializeval($val2);
+                                               $rs.=$val2->serialize($charset_encoding);
                                                $rs.="</member>\n";
                                        }
                                        $rs.='</struct>';
                                case 2:
                                        // array
                                        $rs.="<array>\n<data>\n";
-                                       for($i=0; $i<sizeof($val); $i++)
+                                       for($i=0; $i<count($val); $i++)
                                        {
-                                               $rs.=$this->serializeval($val[$i]);
+                                               //$rs.=$this->serializeval($val[$i]);
+                                               $rs.=$val[$i]->serialize($charset_encoding);
                                        }
                                        $rs.="</data>\n</array>";
                                        break;
-                               case 1:
-                                       switch ($typ)
-                                       {
-                                               case $xmlrpcBase64:
-                                                       $rs.="<${typ}>" . base64_encode($val) . "</${typ}>";
-                                                       break;
-                                               case $xmlrpcBoolean:
-                                                       $rs.="<${typ}>" . ($val ? '1' : '0') . "</${typ}>";
-                                                       break;
-                                               case $xmlrpcString:
-                                                       // G. Giunta 2005/2/13: do NOT use htmlentities, since
-                                                       // it will produce named html entities, which are invalid xml
-                                                       // $rs.="<${typ}>" . xmlrpc_encode_entitites($val). "</${typ}>";
-                                                       // $rs.="<${typ}>" . htmlentities($val). "</${typ}>";
-                                                       
-                                                       // N. Leenheer 2005/6/30: Use CDATA instead... 
-                                                       $rs.="<${typ}><![CDATA[" . $val. "]]></${typ}>";
-                                                       break;
-                                               default:
-                                                       $rs.="<${typ}>${val}</${typ}>";
-                                       }
-                                       break;
                                default:
                                        break;
                        }
                        return $rs;
                }
 
-               function serialize()
-               {
-                       return $this->serializeval($this);
+               /**
+               * Returns xml representation of the value. XML prologue not included
+               * @param string $charset_encoding the charset to be used for serialization. if null, US-ASCII is assumed
+               * @return string
+               * @access public
+               */
+               function serialize($charset_encoding='')
+               {
+                       // add check? slower, but helps to avoid recursion in serializing broken xmlrpcvals...
+                       //if (is_object($o) && (get_class($o) == 'xmlrpcval' || is_subclass_of($o, 'xmlrpcval')))
+                       //{
+                               reset($this->me);
+                               list($typ, $val) = each($this->me);
+                               return '<value>' . $this->serializedata($typ, $val, $charset_encoding) . "</value>\n";
+                       //}
                }
 
+               // DEPRECATED
                function serializeval($o)
                {
-                       //global $xmlrpcTypes;
-                       $rs='';
-                       $ar=$o->me;
-                       reset($ar);
-                       list($typ, $val) = each($ar);
-                       $rs.='<value>';
-                       $rs.=$this->serializedata($typ, $val);
-                       $rs.="</value>\n";
-                       return $rs;
+                       // add check? slower, but helps to avoid recursion in serializing broken xmlrpcvals...
+                       //if (is_object($o) && (get_class($o) == 'xmlrpcval' || is_subclass_of($o, 'xmlrpcval')))
+                       //{
+                               $ar=$o->me;
+                               reset($ar);
+                               list($typ, $val) = each($ar);
+                               return '<value>' . $this->serializedata($typ, $val) . "</value>\n";
+                       //}
+               }
+
+               /**
+               * Checks wheter a struct member with a given name is present.
+               * Works only on xmlrpcvals of type struct.
+               * @param string $m the name of the struct member to be looked up
+               * @return boolean
+               * @access public
+               */
+               function structmemexists($m)
+               {
+                       return array_key_exists($m, $this->me['struct']);
                }
 
+               /**
+               * Returns the value of a given struct member (an xmlrpcval object in itself).
+               * Will raise a php warning if struct member of given name does not exist
+               * @param string $m the name of the struct member to be looked up
+               * @return xmlrpcval
+               * @access public
+               */
                function structmem($m)
                {
-                       $nv=$this->me['struct'][$m];
-                       return $nv;
+                       return $this->me['struct'][$m];
                }
 
+               /**
+               * Reset internal pointer for xmlrpcvals of type struct.
+               * @access public
+               */
                function structreset()
                {
                        reset($this->me['struct']);
                }
 
+               /**
+               * Return next member element for xmlrpcvals of type struct.
+               * @return xmlrpcval
+               * @access public
+               */
                function structeach()
                {
                        return each($this->me['struct']);
                }
 
+               // DEPRECATED! this code looks like it is very fragile and has not been fixed
+               // for a long long time. Shall we remove it for 2.0?
                function getval()
                {
                        // UNSTABLE
-                       global $xmlrpcBoolean, $xmlrpcBase64;
                        reset($this->me);
                        list($a,$b)=each($this->me);
                        // contributed by I Sofer, 2001-03-24
                        // i've created a new method here, so as to
                        // preserve back compatibility
 
-                       if (is_array($b))
+                       if(is_array($b))
                        {
                                @reset($b);
                                while(list($id,$cont) = @each($b))
                        }
 
                        // add support for structures directly encoding php objects
-                       if (is_object($b))
+                       if(is_object($b))
                        {
                                $t = get_object_vars($b);
                                @reset($t);
                                @reset($t);
                                while(list($id,$cont) = @each($t))
                                {
-                                       //eval('$b->'.$id.' = $cont;');
                                        @$b->$id = $cont;
                                }
                        }
                        return $b;
                }
 
+               /**
+               * Returns the value of a scalar xmlrpcval
+               * @return mixed
+               * @access public
+               */
                function scalarval()
                {
-                       //global $xmlrpcBoolean, $xmlrpcBase64;
                        reset($this->me);
-                       list($a,$b)=each($this->me);
+                       list(,$b)=each($this->me);
                        return $b;
                }
 
+               /**
+               * Returns the type of the xmlrpcval.
+               * For integers, 'int' is always returned in place of 'i4'
+               * @return string
+               * @access public
+               */
                function scalartyp()
                {
-                       global $xmlrpcI4, $xmlrpcInt;
                        reset($this->me);
-                       list($a,$b)=each($this->me);
-                       if ($a==$xmlrpcI4)
+                       list($a,)=each($this->me);
+                       if($a==$GLOBALS['xmlrpcI4'])
                        {
-                               $a=$xmlrpcInt;
+                               $a=$GLOBALS['xmlrpcInt'];
                        }
                        return $a;
                }
 
+               /**
+               * Returns the m-th member of an xmlrpcval of struct type
+               * @param integer $m the index of the value to be retrieved (zero based)
+               * @return xmlrpcval
+               * @access public
+               */
                function arraymem($m)
                {
-                       $nv=$this->me['array'][$m];
-                       return $nv;
+                       return $this->me['array'][$m];
                }
 
+               /**
+               * Returns the number of members in an xmlrpcval of array type
+               * @return integer
+               * @access public
+               */
                function arraysize()
                {
-                       reset($this->me);
-                       list($a,$b)=each($this->me);
-                       return sizeof($b);
+                       return count($this->me['array']);
+               }
+
+               /**
+               * Returns the number of members in an xmlrpcval of struct type
+               * @return integer
+               * @access public
+               */
+               function structsize()
+               {
+                       return count($this->me['struct']);
                }
        }
 
+
        // date helpers
+
+       /**
+       * Given a timestamp, return the corresponding ISO8601 encoded string.
+       *
+       * Really, timezones ought to be supported
+       * but the XML-RPC spec says:
+       *
+       * "Don't assume a timezone. It should be specified by the server in its
+       * documentation what assumptions it makes about timezones."
+       *
+       * These routines always assume localtime unless
+       * $utc is set to 1, in which case UTC is assumed
+       * and an adjustment for locale is made when encoding
+       *
+       * @param int $timet (timestamp)
+       * @param int $utc (0 or 1)
+       * @return string
+       */
        function iso8601_encode($timet, $utc=0)
        {
-               // return an ISO8601 encoded string
-               // really, timezones ought to be supported
-               // but the XML-RPC spec says:
-               //
-               // "Don't assume a timezone. It should be specified by the server in its
-               // documentation what assumptions it makes about timezones."
-               // 
-               // these routines always assume localtime unless 
-               // $utc is set to 1, in which case UTC is assumed
-               // and an adjustment for locale is made when encoding
-               if (!$utc)
+               if(!$utc)
                {
                        $t=strftime("%Y%m%dT%H:%M:%S", $timet);
                }
                else
                {
-                       if (function_exists('gmstrftime'))
+                       if(function_exists('gmstrftime'))
                        {
                                // gmstrftime doesn't exist in some versions
                                // of PHP
                return $t;
        }
 
+       /**
+       * Given an ISO8601 date string, return a timet in the localtime, or UTC
+       * @param string $idate
+       * @param int $utc either 0 or 1
+       * @return int (datetime)
+       */
        function iso8601_decode($idate, $utc=0)
        {
-               // return a timet in the localtime, or UTC
                $t=0;
-               if (ereg("([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})", $idate, $regs))
+               if(preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/', $idate, $regs))
                {
-                       if ($utc)
+                       if($utc)
                        {
                                $t=gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
                        }
                        {
                                $t=mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
                        }
-               } 
-               return $t;
-       }
-
-       /****************************************************************
-       * xmlrpc_decode takes a message in PHP xmlrpc object format and *
-       * tranlates it into native PHP types.                           *
-       *                                                               *
-       * author: Dan Libby (dan@libby.com)                             *
-       ****************************************************************/
-       function php_xmlrpc_decode($xmlrpc_val)
-       {
-               $kind = $xmlrpc_val->kindOf();
-
-               if($kind == 'scalar')
-               {
-                       return $xmlrpc_val->scalarval();
-               }
-               elseif($kind == 'array')
-               {
-                       $size = $xmlrpc_val->arraysize();
-                       $arr = array();
-
-                       for($i = 0; $i < $size; $i++)
-                       {
-                               $arr[] = php_xmlrpc_decode($xmlrpc_val->arraymem($i));
-                       }
-                       return $arr;
-               }
-               elseif($kind == 'struct')
-               {
-                       $xmlrpc_val->structreset();
-                       $arr = array();
-
-                       while(list($key,$value)=$xmlrpc_val->structeach())
-                       {
-                               $arr[$key] = php_xmlrpc_decode($value);
-                       }
-                       return $arr;
                }
+               return $t;
        }
 
-       if(function_exists('xmlrpc_decode'))
-       {
-               define('XMLRPC_EPI_ENABLED','1');
-       }
-       else
+       /**
+       * Takes an xmlrpc value in PHP xmlrpcval object format and translates it into native PHP types.
+       *
+       * Works with xmlrpc message objects as input, too.
+       *
+       * Given proper options parameter, can rebuild generic php object instances
+       * (provided those have been encoded to xmlrpc format using a corresponding
+       * option in php_xmlrpc_encode())
+       * PLEASE NOTE that rebuilding php objects involves calling their constructor function.
+       * This means that the remote communication end can decide which php code will
+       * get executed on your server, leaving the door possibly open to 'php-injection'
+       * style of attacks (provided you have some classes defined on your server that
+       * might wreak havoc if instances are built outside an appropriate context).
+       * Make sure you trust the remote server/client before eanbling this!
+       *
+       * @author Dan Libby (dan@libby.com)
+       *
+       * @param xmlrpcval $xmlrpc_val
+       * @param array $options if 'decode_php_objs' is set in the options array, xmlrpc structs can be decoded into php objects
+       * @return mixed
+       */
+       function php_xmlrpc_decode($xmlrpc_val, $options=array())
        {
-               define('XMLRPC_EPI_ENABLED','0');
-               function xmlrpc_decode($xmlrpc_val)
+               switch($xmlrpc_val->kindOf())
                {
-                       $kind = $xmlrpc_val->kindOf();
-
-                       if($kind == 'scalar')
-                       {
+                       case 'scalar':
+                               if (in_array('extension_api', $options))
+                               {
+                                       reset($xmlrpc_val->me);
+                                       list($typ,$val) = each($xmlrpc_val->me);
+                                       switch ($typ)
+                                       {
+                                               case 'dateTime.iso8601':
+                                                       $xmlrpc_val->scalar = $val;
+                                                       $xmlrpc_val->xmlrpc_type = 'datetime';
+                                                       $xmlrpc_val->timestamp = iso8601_decode($val);
+                                                       return $xmlrpc_val;
+                                               case 'base64':
+                                                       $xmlrpc_val->scalar = $val;
+                                                       $xmlrpc_val->type = $typ;
+                                                       return $xmlrpc_val;
+                                               default:
+                                                       return $xmlrpc_val->scalarval();
+                                       }
+                               }
                                return $xmlrpc_val->scalarval();
-                       }
-                       elseif($kind == 'array')
-                       {
+                       case 'array':
                                $size = $xmlrpc_val->arraysize();
                                $arr = array();
-
                                for($i = 0; $i < $size; $i++)
                                {
-                                       $arr[]=xmlrpc_decode($xmlrpc_val->arraymem($i));
+                                       $arr[] = php_xmlrpc_decode($xmlrpc_val->arraymem($i), $options);
                                }
                                return $arr;
-                       }
-                       elseif($kind == 'struct')
-                       {
+                       case 'struct':
                                $xmlrpc_val->structreset();
+                               // If user said so, try to rebuild php objects for specific struct vals.
+                               /// @todo should we raise a warning for class not found?
+                               // shall we check for proper subclass of xmlrpcval instead of
+                               // presence of _php_class to detect what we can do?
+                               if (in_array('decode_php_objs', $options) && $xmlrpc_val->_php_class != ''
+                                       && class_exists($xmlrpc_val->_php_class))
+                               {
+                                       $obj = @new $xmlrpc_val->_php_class;
+                                       while(list($key,$value)=$xmlrpc_val->structeach())
+                                       {
+                                               $obj->$key = php_xmlrpc_decode($value, $options);
+                                       }
+                                       return $obj;
+                               }
+                               else
+                               {
+                                       $arr = array();
+                              &n