PEAR command: more Proxy authentication

forward: i sent it to the wrong list. Hello, here are a few more patches. The name includes the version against which the patch applies and should be self-explanatory. I could not test them in an proxy-less environment. If it breaks something, please tell me. Arnaud

373a374,375 > var $proxy_user = ''; > var $proxy_pass = ''; 375c377 < function XML_RPC_Client($path, $server, $port=80, $proxy="", $proxy_port=8080) --- > function XML_RPC_Client($path, $server, $port=80, $proxy = '', $proxy_port = 8080, $proxy_user = '', $proxy_pass = '') 377,381c379,385 < $this->port=$port; < $this->server=$server; < $this->path=$path; < $this->proxy = $proxy; < $this->proxy_port = $proxy_port ; --- > $this->port =$port; > $this->server =$server; > $this->path =$path; > $this->proxy = $proxy; > $this->proxy_port = $proxy_port; > $this->proxy_user = $proxy_user; > $this->proxy_pass = $proxy_pass; 460,461c464,471 < "Host: ". $this->server . "\r\n" . < $credentials . --- > "Host: ". $this->server . "\r\n"; > > if ($this->proxy && $this->proxy_user != '') { > $op .= 'Proxy-Authorization: Basic ' . > base64_encode($this->proxy_user . ':' . $this->proxy_pass) . "\r\n"; > } > > $op .= $credentials . 65a66,72 > $proxy_host = $proxy_port = $proxy_user = $proxy_pass = ''; > 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']; > } 69c76 < $c = new XML_RPC_Client('/xmlrpc.php', $server_host, 80); --- > $c = new XML_RPC_Client('/xmlrpc.php', $server_host, 80, $proxy_host, $proxy_port, $proxy_user, $proxy_pass); 20c20 < // $Id: Common.php,v 1.76 2002/07/04 20:28:56 mj Exp $ --- > // $Id: Common.php,v 1.75 2002/06/19 23:38:45 cox Exp $ 1433,1437c1433,1440 < $proxy_host = $proxy_port = null; < if ($proxy = $config->get('http_proxy')) { < $proxy = str_replace('http://', '', $proxy); < list($proxy_host, $proxy_port) = explode(':', $proxy); < if (empty($proxy_port)) { --- > $proxy_host = $proxy_port = $proxy_user = $proxy_pass = ''; > if ($proxy = parse_url($config->get('http_proxy'))) { > $proxy_host = $proxy['host']; > $proxy_port = $proxy['port']; > $proxy_user = $proxy['user']; > $proxy_pass = $proxy['pass']; > > if ($proxy_port == '') { 1447c1450 < if ($proxy_host) { --- > if ($proxy_host != '') { 1468,1470c1471,1477 < $request .= "Host: $host:$port\r\n". < "User-Agent: ".PHP_VERSION."\r\n". < "\r\n"; --- > $request .= "Host: $host:$port\r\n" . > "User-Agent: ".PHP_VERSION."\r\n"; > if ($proxy_host != '' && $proxy_user != '') { > $request .= 'Proxy-Authorization: Basic ' . > base64_encode($proxy_user . ':' . $proxy_pass) . "\r\n"; > } > $request .= "\r\n"; -- PEAR CVS Mailing List (http://pear.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php