From: garvinhicking <garvinhicking>
Date: Tue, 19 Jul 2005 10:39:57 +0000 (+0000)
Subject: backport
X-Git-Tag: 0.8.3~26
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=67f2ae19de8c0b22d03cbf4b3bc12dc243db81b6;p=s9y.git

backport
---

diff --git a/bundled-libs/BUNDLE_NOTICE b/bundled-libs/BUNDLE_NOTICE
new file mode 100644
index 0000000..b8129a7
--- /dev/null
+++ b/bundled-libs/BUNDLE_NOTICE
@@ -0,0 +1,10 @@
+- Replace: 
+Request.php:
+require_once('PEAR.php');
+require_once(dirname(__FILE__) . '/../PEAR.php';
+
+require_once('Net/Socket.php');
+require_once(dirname(__FILE__) . '/../Net/Socket.php';
+
+require_once('Net/URL.php');
+require_once(dirname(__FILE__) . '/../Net/URL.php';
\ No newline at end of file
diff --git a/bundled-libs/Cache/BUNDLE_NOTICE b/bundled-libs/Cache/BUNDLE_NOTICE
new file mode 100644
index 0000000..2fab53a
--- /dev/null
+++ b/bundled-libs/Cache/BUNDLE_NOTICE
@@ -0,0 +1,8 @@
+- Replace: 
+Lite.php:
+include_once('PEAR.php');
+include_once dirname(__FILE__) . '/../../PEAR.php';
+
+Output.php, Function.php:
+require_once('Cache/Lite.php');
+require_once(dirname(__FILE__) . '/../Lite.php';
\ No newline at end of file
diff --git a/bundled-libs/Cache/Lite.php b/bundled-libs/Cache/Lite.php
index 34e5bcd..b8d47f4 100644
--- a/bundled-libs/Cache/Lite.php
+++ b/bundled-libs/Cache/Lite.php
@@ -494,7 +494,7 @@ class Cache_Lite
     */
     function raiseError($msg, $code)
     {
-        include_once('PEAR.php');
+        include_once(dirname(__FILE__) . '/../../PEAR.php');
         PEAR::raiseError($msg, $code, $this->_pearErrorMode);
     }
     
diff --git a/bundled-libs/Cache/Lite/Function.php b/bundled-libs/Cache/Lite/Function.php
index 0d69e22..0ed15fb 100644
--- a/bundled-libs/Cache/Lite/Function.php
+++ b/bundled-libs/Cache/Lite/Function.php
@@ -16,7 +16,7 @@
 * @author Fabien MARTY <fab@php.net>
 */
  
-require_once('Cache/Lite.php');
+require_once(dirname(__FILE__) . '/../Lite.php');
 
 class Cache_Lite_Function extends Cache_Lite
 {
diff --git a/bundled-libs/HTTP/BUNDLE_NOTICE b/bundled-libs/HTTP/BUNDLE_NOTICE
new file mode 100644
index 0000000..c4e2445
--- /dev/null
+++ b/bundled-libs/HTTP/BUNDLE_NOTICE
@@ -0,0 +1,10 @@
+- Replace: 
+Request.php:
+require_once('PEAR.php');
+require_once(dirname(__FILE__) . '/../PEAR.php');
+
+require_once('Net/Socket.php');
+require_once(dirname(__FILE__) . '/../Net/Socket.php');
+
+require_once('Net/URL.php');
+require_once(dirname(__FILE__) . '/../Net/URL.php');
\ No newline at end of file
diff --git a/bundled-libs/HTTP/Request.php b/bundled-libs/HTTP/Request.php
index 581dbc6..5b7ed0f 100644
--- a/bundled-libs/HTTP/Request.php
+++ b/bundled-libs/HTTP/Request.php
@@ -43,9 +43,9 @@
 // echo $a->getResponseBody();
 //
 
-require_once 'PEAR.php';
-require_once 'Net/Socket.php';
-require_once 'Net/URL.php';
+require_once(dirname(__FILE__) . '/../PEAR.php');
+require_once(dirname(__FILE__) . '/../Net/Socket.php');
+require_once(dirname(__FILE__) . '/../Net/URL.php');
 
 define('HTTP_REQUEST_METHOD_GET',     'GET',     true);
 define('HTTP_REQUEST_METHOD_HEAD',    'HEAD',    true);
diff --git a/bundled-libs/Net/BUNDLE_NOTICE b/bundled-libs/Net/BUNDLE_NOTICE
new file mode 100644
index 0000000..e4157ae
--- /dev/null
+++ b/bundled-libs/Net/BUNDLE_NOTICE
@@ -0,0 +1,9 @@
+- Replace: 
+DNSBL.php
+require_once 'Net/CheckIP.php';
+require_once dirname(__FILE__) . '/CheckIP.php';
+
+Socket.php
+require_once('PEAR.php');
+require_once(dirname(__FILE__) . '/../PEAR.php');
+
diff --git a/bundled-libs/Net/DNSBL.php b/bundled-libs/Net/DNSBL.php
index ce6837b..3091dab 100644
--- a/bundled-libs/Net/DNSBL.php
+++ b/bundled-libs/Net/DNSBL.php
@@ -32,7 +32,7 @@
  * @license http://www.php.net/license/3_0.txt
  * @version 0.5.3
  */
-require_once 'Net/CheckIP.php';
+require_once dirname(__FILE__) . '/CheckIP.php';
 
 class Net_DNSBL {
 
diff --git a/bundled-libs/Net/DNSBL/BUNDLE_NOTICE b/bundled-libs/Net/DNSBL/BUNDLE_NOTICE
new file mode 100644
index 0000000..b175048
--- /dev/null
+++ b/bundled-libs/Net/DNSBL/BUNDLE_NOTICE
@@ -0,0 +1,13 @@
+- Replace: 
+SURBL.php
+require_once 'Cache/Lite.php';
+require_once dirname(__FILE__) . '/../../Cache/Lite.php';
+
+require_once 'HTTP/Request.php';
+require_once dirname(__FILE__) . '/../../HTTP/Request.php';
+
+require_once 'Net/CheckIP.php';
+require_once dirname(__FILE__) . '/../CheckIP.php';
+
+require_once 'Net/DNSBL.php';
+require_once dirname(__FILE__) . '/../DNSBL.php';
\ No newline at end of file
diff --git a/bundled-libs/Net/DNSBL/SURBL.php b/bundled-libs/Net/DNSBL/SURBL.php
index d239fd5..9ffd786 100644
--- a/bundled-libs/Net/DNSBL/SURBL.php
+++ b/bundled-libs/Net/DNSBL/SURBL.php
@@ -31,10 +31,10 @@
  * @license http://www.php.net/license/3_0.txt
  * @version 0.5.4
  */
-require_once 'Cache/Lite.php';
-require_once 'HTTP/Request.php';
-require_once 'Net/CheckIP.php';
-require_once 'Net/DNSBL.php';
+require_once dirname(__FILE__) . '/../../Cache/Lite.php';
+require_once dirname(__FILE__) . '/../../HTTP/Request.php';
+require_once dirname(__FILE__) . '/../CheckIP.php';
+require_once dirname(__FILE__) . '/../DNSBL.php';
 
 class Net_DNSBL_SURBL extends Net_DNSBL {
 
diff --git a/bundled-libs/Net/Socket.php b/bundled-libs/Net/Socket.php
index 7c4ff1d..669a7b5 100644
--- a/bundled-libs/Net/Socket.php
+++ b/bundled-libs/Net/Socket.php
@@ -19,7 +19,7 @@
 //
 // $Id: Socket.php,v 1.24 2005/02/03 20:40:16 chagenbu Exp $
 
-require_once 'PEAR.php';
+require_once(dirname(__FILE__) . '/../PEAR.php');
 
 define('NET_SOCKET_READ',  1);
 define('NET_SOCKET_WRITE', 2);
diff --git a/bundled-libs/XML/BUNDLE_NOTICE b/bundled-libs/XML/BUNDLE_NOTICE
new file mode 100644
index 0000000..ebdcc64
--- /dev/null
+++ b/bundled-libs/XML/BUNDLE_NOTICE
@@ -0,0 +1,8 @@
+- Replace: 
+RPC.php:
+include_once 'PEAR.php'
+include_once dirname(__FILE__) . '/../../PEAR.php';
+
+RPC/Server.php:
+require_once 'RPC/RPC.php';
+require_once dirname(__FILE__) . '/../RPC.php';
\ No newline at end of file
diff --git a/bundled-libs/XML/RPC.php b/bundled-libs/XML/RPC.php
index 2a0b652..7f4f022 100644
--- a/bundled-libs/XML/RPC.php
+++ b/bundled-libs/XML/RPC.php
@@ -468,7 +468,7 @@ class XML_RPC_Base {
      */
     function raiseError($msg, $code)
     {
-        include_once 'PEAR.php';
+        include_once dirname(__FILE__) . '/../PEAR.php';
         if (is_object(@$this)) {
             return PEAR::raiseError(get_class($this) . ': ' . $msg, $code);
         } else {