cvs: php-src(PHP_4_3) /pear/PEAR Remote.php
| From: | Greg Beaver | Date: | Tue, 08 Jun 2004 18:04:00 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /pear/PEAR Remote.php | ||
| Groups: | php.pear.cvs php.pear.core | ||
| Request: | Send a blank email to pear-core+get-379@lists.php.net to get a copy of this message | ||
cellog Tue Jun 8 14:04:00 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/pear/PEAR Remote.php
Log:
MFH fix bug #1378: user/pass must be urldecoded from parse_url in Remote.php
http://cvs.php.net/diff.php/php-src/pear/PEAR/Remote.php?r1=1.34.2.13&r2=1.34.2.14&ty=u
Index: php-src/pear/PEAR/Remote.php
diff -u php-src/pear/PEAR/Remote.php:1.34.2.13 php-src/pear/PEAR/Remote.php:1.34.2.14
--- php-src/pear/PEAR/Remote.php:1.34.2.13 Sun Jan 25 20:26:46 2004
+++ php-src/pear/PEAR/Remote.php Tue Jun 8 14:04:00 2004
@@ -16,7 +16,7 @@
// | Author: Stig Bakken <ssb@php.net> |
// +----------------------------------------------------------------------+
//
-// $Id: Remote.php,v 1.34.2.13 2004/01/26 01:26:46 pajoye Exp $
+// $Id: Remote.php,v 1.34.2.14 2004/06/08 18:04:00 cellog Exp $
require_once 'PEAR.php';
require_once 'PEAR/Config.php';
@@ -135,8 +135,8 @@
if ($proxy = parse_url($this->config->get('http_proxy'))) {
$proxy_host = @$proxy['host'];
$proxy_port = @$proxy['port'];
- $proxy_user = @$proxy['user'];
- $proxy_pass = @$proxy['pass'];
+ $proxy_user = @urldecode(@$proxy['user']);
+ $proxy_pass = @urldecode(@$proxy['pass']);
}
$c = new XML_RPC_Client('/xmlrpc.php'.$maxAge, $server_host, 80, $proxy_host,
$proxy_port, $proxy_user, $proxy_pass);
if ($username && $password) {
@@ -206,8 +206,8 @@
$proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
$proxy_host = @$proxy['host'];
$proxy_port = @$proxy['port'];
- $proxy_user = @$proxy['user'];
- $proxy_pass = @$proxy['pass'];
+ $proxy_user = @urldecode(@$proxy['user']);
+ $proxy_pass = @urldecode(@$proxy['pass']);
$fp = @fsockopen($proxy_host, $proxy_port);
$use_proxy = true;
} else {