- Fixed build on php-trunk

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

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);
        }
        
        /**