Merge branch 'master' of git://github.com/zendframework/zf2

zendframework · Jun 26, 2011 · d1673d5 · d1673d5
13 parents 38d4ac0 + 5a530d5 + 70330aa + 10f278f + 252fdc8 + 023de10 + 85fcc7b + 5d8866f + 634bb62 + 453bb28 + c8dba7b + f7017f6 + c10ba52
commit d1673d5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Client/Adapter/Proxy.php b/src/Client/Adapter/Proxy.php
@@ -132,7 +132,7 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $bod
 
         // Add Proxy-Authorization header
         if ($this->config['proxy_user'] && ! isset($headers['proxy-authorization'])) {
-            $headers['proxy-authorization'] = Client\Client::encodeAuthHeader(
+            $headers['proxy-authorization'] = Client::encodeAuthHeader(
                 $this->config['proxy_user'], $this->config['proxy_pass'], $this->config['proxy_auth']
             );
         }
@@ -223,7 +223,7 @@ protected function connectHandshake($host, $port = 443, $http_ver = '1.1', array
             $gotStatus = $gotStatus || (strpos($line, 'HTTP') !== false);
             if ($gotStatus) {
                 $response .= $line;
-                if (!chop($line)) break;
+                if (!rtrim($line)) break;
             }
         }