From: nohn <nohn>
Date: Fri, 15 Jul 2005 17:45:31 +0000 (+0000)
Subject: upgrade xml_rpc to 1.3.3
X-Git-Tag: 0.9~306
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=932a790b4046488f62434c0482e861c3e03cbb8d;p=s9y.git

upgrade xml_rpc to 1.3.3
---

diff --git a/bundled-libs/.current_version b/bundled-libs/.current_version
index 380faca..7e84123 100644
--- a/bundled-libs/.current_version
+++ b/bundled-libs/.current_version
@@ -5,4 +5,4 @@ Net_Socket           	1.0.6
 Net_URL              	1.0.14
 PEAR			1.3.5
 Text_Wiki		0.25.0
-XML_RPC 		1.3.2
\ No newline at end of file
+XML_RPC 		1.3.3
\ No newline at end of file
diff --git a/bundled-libs/XML/RPC.php b/bundled-libs/XML/RPC.php
index 01c91a0..2a0b652 100644
--- a/bundled-libs/XML/RPC.php
+++ b/bundled-libs/XML/RPC.php
@@ -32,7 +32,7 @@
  * @author     Martin Jansen <mj@php.net>
  * @author     Daniel Convissor <danielc@php.net>
  * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
- * @version    CVS: $Id: RPC.php,v 1.79 2005/07/07 01:08:28 danielc Exp $
+ * @version    CVS: $Id: RPC.php,v 1.81 2005/07/14 02:15:26 danielc Exp $
  * @link       http://pear.php.net/package/XML_RPC
  */
 
@@ -456,7 +456,7 @@ function XML_RPC_cd($parser_resource, $data)
  * @author     Martin Jansen <mj@php.net>
  * @author     Daniel Convissor <danielc@php.net>
  * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
- * @version    Release: 1.3.2
+ * @version    Release: 1.3.3
  * @link       http://pear.php.net/package/XML_RPC
  */
 class XML_RPC_Base {
@@ -501,7 +501,7 @@ class XML_RPC_Base {
  * @author     Martin Jansen <mj@php.net>
  * @author     Daniel Convissor <danielc@php.net>
  * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
- * @version    Release: 1.3.2
+ * @version    Release: 1.3.3
  * @link       http://pear.php.net/package/XML_RPC
  */
 class XML_RPC_Client extends XML_RPC_Base {
@@ -828,7 +828,11 @@ class XML_RPC_Client extends XML_RPC_Base {
         }
 
         if ($timeout) {
-            stream_set_timeout($fp, $timeout);
+            /*
+             * Using socket_set_timeout() because stream_set_timeout()
+             * was introduced in 4.3.0, but we need to support 4.2.0.
+             */
+            socket_set_timeout($fp, $timeout);
         }
 
         // Pre-emptive BC hacks for fools calling sendPayloadHTTP10() directly
@@ -919,7 +923,7 @@ class XML_RPC_Client extends XML_RPC_Base {
  * @author     Martin Jansen <mj@php.net>
  * @author     Daniel Convissor <danielc@php.net>
  * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
- * @version    Release: 1.3.2
+ * @version    Release: 1.3.3
  * @link       http://pear.php.net/package/XML_RPC
  */
 class XML_RPC_Response extends XML_RPC_Base
@@ -1010,7 +1014,7 @@ class XML_RPC_Response extends XML_RPC_Base
  * @author     Martin Jansen <mj@php.net>
  * @author     Daniel Convissor <danielc@php.net>
  * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
- * @version    Release: 1.3.2
+ * @version    Release: 1.3.3
  * @link       http://pear.php.net/package/XML_RPC
  */
 class XML_RPC_Message extends XML_RPC_Base
@@ -1246,6 +1250,7 @@ class XML_RPC_Message extends XML_RPC_Base
         $parser_resource = xml_parser_create($encoding);
         $parser = (int) $parser_resource;
 
+        $XML_RPC_xh = array();
         $XML_RPC_xh[$parser] = array();
 
         $XML_RPC_xh[$parser]['st'] = '';
@@ -1348,7 +1353,7 @@ class XML_RPC_Message extends XML_RPC_Base
  * @author     Martin Jansen <mj@php.net>
  * @author     Daniel Convissor <danielc@php.net>
  * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
- * @version    Release: 1.3.2
+ * @version    Release: 1.3.3
  * @link       http://pear.php.net/package/XML_RPC
  */
 class XML_RPC_Value extends XML_RPC_Base
diff --git a/bundled-libs/XML/RPC/Dump.php b/bundled-libs/XML/RPC/Dump.php
index 6813ad3..84eaa20 100644
--- a/bundled-libs/XML/RPC/Dump.php
+++ b/bundled-libs/XML/RPC/Dump.php
@@ -42,7 +42,7 @@ function XML_RPC_Dump($value)
  * @category   Web Services
  * @package    XML_RPC
  * @author     Christian Weiske <cweiske@php.net>
- * @version    Release: 1.3.2
+ * @version    Release: 1.3.3
  * @link       http://pear.php.net/package/XML_RPC
  */
 class XML_RPC_Dump
diff --git a/bundled-libs/XML/RPC/Server.php b/bundled-libs/XML/RPC/Server.php
index 70c43e1..ca11777 100644
--- a/bundled-libs/XML/RPC/Server.php
+++ b/bundled-libs/XML/RPC/Server.php
@@ -40,7 +40,7 @@
 /**
  * Pull in the XML_RPC class
  */
-require_once dirname(__FILE__) . '/../RPC.php';
+require_once 'XML/RPC.php';
 
 
 /**
@@ -270,7 +270,7 @@ function XML_RPC_Server_debugmsg($m)
  * @author     Martin Jansen <mj@php.net>
  * @author     Daniel Convissor <danielc@php.net>
  * @copyright  1999-2001 Edd Dumbill, 2001-2005 The PHP Group
- * @version    Release: 1.3.2
+ * @version    Release: 1.3.3
  * @link       http://pear.php.net/package/XML_RPC
  */
 class XML_RPC_Server
diff --git a/docs/NEWS b/docs/NEWS
index 23effd2..f4bc4b6 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -158,7 +158,7 @@ Version 0.8.3 ()
 	Net_URL         to 1.0.14
 	PEAR		to 1.3.5
 	Text_Wiki	to 0.25.0
-	XML_RPC		to 1.3.2
+	XML_RPC		to 1.3.3
      Fixing several bugs and vulnerabilities. (nohn)
 
    * Fix editing a draft article to be properly displayed as draft