]> granicus.if.org Git - php/commitdiff
fix bug #1378: user/pass must be urldecoded from parse_url in Remote.php
authorGreg Beaver <cellog@php.net>
Tue, 8 Jun 2004 18:03:46 +0000 (18:03 +0000)
committerGreg Beaver <cellog@php.net>
Tue, 8 Jun 2004 18:03:46 +0000 (18:03 +0000)
pear/PEAR/Remote.php

index 4ef3da8f1aae526e5254d950dfc26008b01cde76..c75b11b5c19063c38898ff83101b2997762520a5 100644 (file)
@@ -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 {