- improve handling of xmlrpc request/response options

diff --git a/lib/XmlRpcClient.php b/lib/XmlRpcClient.php
index 488e1cf0c59e91f25f6406acedb56c0b9bc0bc58..8668291bd0a31cb7566f5dad25bd2c026b4ff6c3 100644 (file)
--- a/lib/XmlRpcClient.php
+++ b/lib/XmlRpcClient.php
@@ -47,6 +47,13 @@ class XmlRpcClient
         */
        public $__encoding = "iso-8859-1";
        
+       /**
+        * RPC options
+        * 
+        * @var array
+        */
+       public $__options;
+       
        /**
         * Constructor
         *
@@ -54,9 +61,9 @@ class XmlRpcClient
         * @param string $namespace RPC namespace
         * @param array  $options HttpRequest options
         */
-       public function __construct($url, $namespace = '', array $options = array())
+       public function __construct($url, $namespace = '', array $options = null)
        {
-               $this->__request = new HttpRequest($url, HttpRequest::METH_POST, $options);
+               $this->__request = new HttpRequest($url, HttpRequest::METH_POST, (array) $options);
                $this->__namespace = $namespace;
        }
        
@@ -76,7 +83,7 @@ class XmlRpcClient
                $this->__request->setContentType("text/xml");
                $this->__request->setRawPostData(
                        xmlrpc_encode_request($method, $params, 
-                               array("encoding" => $this->__encoding)));
+                               array("encoding" => $this->__encoding) + (array) $this->__options));
                $response = $this->__request->send();
                if ($response->getResponseCode() != 200) {
                        throw new Exception(

diff --git a/lib/XmlRpcServer.php b/lib/XmlRpcServer.php
index a9f7505ed807205e1bfd5db945d09884bee709c6..c8c1ac40a9930f7161d934f01bf0fe5e1b4aa191 100644 (file)
--- a/lib/XmlRpcServer.php
+++ b/lib/XmlRpcServer.php
@@ -110,12 +110,13 @@ class XmlRpcServer extends HttpResponse
         *
         * @param string $method
         * @param array $params
-        * @param array $options
+        * @param array $request_options
+        * @param array $response_options
         */
-       public static function test($method, array $params, array $options = null)
+       public static function test($method, array $params, array $request_options = null, array $response_options = null)
        {
-               self::$xmlreq = xmlrpc_encode_request($method, $params);
-               self::run();
+               self::$xmlreq = xmlrpc_encode_request($method, $params, $request_options);
+               self::run($response_options);
        }
        
        /**
@@ -124,9 +125,10 @@ class XmlRpcServer extends HttpResponse
         * @param int $code
         * @param string $msg
         */
-       public static function error($code, $msg)
+       public static function error($code, $msg, array $options = null)
        {
-               echo xmlrpc_encode(array("faultCode" => $code, "faultString" => $msg));
+               echo xmlrpc_encode(array("faultCode" => $code, "faultString" => $msg),
+                       array("encoding" => self::$encoding) + (array) $options);
        }
        
        /**