- Fixed build on php-trunk

[m6w6/ext-http] / lib / XmlRpcClient.php

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";
        
         */
        public $__encoding = "iso-8859-1";
        

+       /**
+        * RPC options
+        * 
+        * @var array
+        */
+       public $__options;
+       

        /**
         * Constructor
         *
        /**
         * Constructor
         *


@@ -54,9 +61,9 @@ class XmlRpcClient
         * @param string $namespace RPC namespace
         * @param array  $options HttpRequest options
         */
         * @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;
        }
        
                $this->__namespace = $namespace;
        }
        


@@ -76,7 +83,7 @@ class XmlRpcClient
                $this->__request->setContentType("text/xml");
                $this->__request->setRawPostData(
                        xmlrpc_encode_request($method, $params, 
                $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(
                $response = $this->__request->send();
                if ($response->getResponseCode() != 200) {
                        throw new Exception(