diff options
| author | Greg Beaver <cellog@php.net> | 2004-06-08 18:03:46 +0000 |
|---|---|---|
| committer | Greg Beaver <cellog@php.net> | 2004-06-08 18:03:46 +0000 |
| commit | 29a09f984c8f4b8887c5d3de14bdcd8e2f15583a (patch) | |
| tree | 6087027805f4bb1752aa9b5df84338e4c1dfa616 /pear | |
| parent | 628e5530b9f017ad3af3c81ba1639ccd2f0b3071 (diff) | |
| download | php-git-29a09f984c8f4b8887c5d3de14bdcd8e2f15583a.tar.gz | |
fix bug #1378: user/pass must be urldecoded from parse_url in Remote.php
Diffstat (limited to 'pear')
| -rw-r--r-- | pear/PEAR/Remote.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pear/PEAR/Remote.php b/pear/PEAR/Remote.php index 4ef3da8f1a..c75b11b5c1 100644 --- a/pear/PEAR/Remote.php +++ b/pear/PEAR/Remote.php @@ -135,8 +135,8 @@ class PEAR_Remote extends PEAR 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 @@ class PEAR_Remote extends PEAR $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 { |