Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into reflection
Browse files Browse the repository at this point in the history
  • Loading branch information
@pierredup
pierredup committed Jan 11, 2013
90 parents 8b4896f + 2f83acc + a44d7dd + 6bce797 + 6ad2b62 + 1e41fbd + a0078e6 + 9db875b + 2879406 + 9acc850 + eddeb7d + 6de3f68 + cb8f354 + 5a77057 + 33c15ff + 9f13ebf + a2ad2a5 + c0ba21c + 94e82a8 + 459f1f9 + e0c8424 + 5ef6a39 + 58fd018 + 65e3b0b + d21655a + 1d20fd1 + fe81bc5 + 96fadae + 072c64d + d3c9780 + 9c15ae8 + 66a4342 + 85c9491 + 8ec8384 + 004366f + 55a086d + ac7c7af + f02a226 + 00c4ac3 + 3f52720 + 5508474 + 49ed2f6 + d562686 + 67b42b2 + bdb1dae + 9809630 + 7304e37 + 752a5af + 8181c8f + 53bdac2 + c2f9414 + f6341e9 + 57cde95 + c750616 + 293054e + 7432649 + 63f13f6 + 927c00d + 44e0d4b + bc03833 + 1fd7c61 + de0cb77 + 66e902f + 24354dc + 9f886a2 + 845333c + 96e9a1e + 52fbeb6 + 7f76d90 + fec4cec + 24efdcc + 219c9ad + 3025666 + 17d48b4 + 00f4506 + 0800032 + fc89677 + e89d79b + f329014 + a1bfde3 + 7dec05c + 734f9f2 + 2756031 + 408f714 + fd53447 + f1f6e0d + e193ac7 + dad06c3 + 03ab3c8 + eb63995 commit a6c1451
Show file tree
Hide file tree
Showing 185 changed files with 375 additions and 373 deletions.
2 changes: 1 addition & 1 deletion src/AbstractMessage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Http
*/
Expand Down
24 changes: 12 additions & 12 deletions src/Client.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Http
*/
Expand Down Expand Up @@ -434,7 +434,7 @@ public function getCookies()
* Get the cookie Id (name+domain+path)
*
* @param Header\SetCookie|Header\Cookie $cookie
* @return string|boolean
* @return string|bool
*/
protected function getCookieId($cookie)
{
Expand All @@ -452,8 +452,8 @@ protected function getCookieId($cookie)
* @param string $expire
* @param string $path
* @param string $domain
* @param boolean $secure
* @param boolean $httponly
* @param bool $secure
* @param bool $httponly
* @param string $maxAge
* @param string $version
* @throws Exception\InvalidArgumentException
Expand Down Expand Up @@ -533,7 +533,7 @@ public function setHeaders($headers)
* Check if exists the header type specified
*
* @param string $name
* @return boolean
* @return bool
*/
public function hasHeader($name)
{
Expand All @@ -550,7 +550,7 @@ public function hasHeader($name)
* Get the header value of the request
*
* @param string $name
* @return string|boolean
* @return string|bool
*/
public function getHeader($name)
{
Expand All @@ -567,7 +567,7 @@ public function getHeader($name)
/**
* Set streaming for received data
*
* @param string|boolean $streamfile Stream file, true for temp file, false/null for no streaming
* @param string|bool $streamfile Stream file, true for temp file, false/null for no streaming
* @return \Zend\Http\Client
*/
public function setStream($streamfile = true)
Expand All @@ -578,7 +578,7 @@ public function setStream($streamfile = true)

/**
* Get status of streaming for received data
* @return boolean|string
* @return bool|string
*/
public function getStream()
{
Expand Down Expand Up @@ -659,7 +659,7 @@ public function setAuth($user, $password, $type = self::AUTH_BASIC)
* @param array $digest
* @param null|string $entityBody
* @throws Exception\InvalidArgumentException
* @return string|boolean
* @return string|bool
*/
protected function calcAuthDigest($user, $password, $type = self::AUTH_BASIC, $digest = array(), $entityBody = null)
{
Expand Down Expand Up @@ -963,7 +963,7 @@ public function setFileUpload($filename, $formname, $data = null, $ctype = null)
* Remove a file to upload
*
* @param string $filename
* @return boolean
* @return bool
*/
public function removeFileUpload($filename)
{
Expand All @@ -981,7 +981,7 @@ public function removeFileUpload($filename)
* @param string $domain
* @param string $path
* @param boolean $secure
* @return Header\Cookie|boolean
* @return Header\Cookie|bool
*/
protected function prepareCookies($domain, $path, $secure)
{
Expand Down Expand Up @@ -1275,7 +1275,7 @@ protected function flattenParametersArray($parray, $prefix = null)
*
* @param Http $uri
* @param string $method
* @param boolean $secure
* @param bool $secure
* @param array $headers
* @param string $body
* @return string the raw response
Expand Down
8 changes: 4 additions & 4 deletions src/Client/Adapter/AdapterInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Http
*/
Expand Down Expand Up @@ -34,7 +34,7 @@ public function setOptions($options = array());
*
* @param string $host
* @param int $port
* @param boolean $secure
* @param bool $secure
*/
public function connect($host, $port = 80, $secure = false);

Expand All @@ -43,12 +43,12 @@ public function connect($host, $port = 80, $secure = false);
*
* @param string $method
* @param \Zend\Uri\Uri $url
* @param string $http_ver
* @param string $httpVer
* @param array $headers
* @param string $body
* @return string Request as text
*/
public function write($method, $url, $http_ver = '1.1', $headers = array(), $body = '');
public function write($method, $url, $httpVer = '1.1', $headers = array(), $body = '');

/**
* Read response from server
Expand Down
4 changes: 2 additions & 2 deletions src/Client/Adapter/Curl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Http
*/
Expand Down Expand Up @@ -178,7 +178,7 @@ public function setCurlOption($option, $value)
*
* @param string $host
* @param int $port
* @param boolean $secure
* @param bool $secure
* @return void
* @throws AdapterException\RuntimeException if unable to connect
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Client/Adapter/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Http
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Client/Adapter/Exception/InitializationException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Http
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Client/Adapter/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Http
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Client/Adapter/Exception/OutOfRangeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Http
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Client/Adapter/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Http
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Client/Adapter/Exception/TimeoutException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Http
*/
Expand Down
32 changes: 17 additions & 15 deletions src/Client/Adapter/Proxy.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Http
*/
Expand Down Expand Up @@ -54,7 +54,7 @@ class Proxy extends Socket
/**
* Whether HTTPS CONNECT was already negotiated with the proxy or not
*
* @var boolean
* @var bool
*/
protected $negotiated = false;

Expand Down Expand Up @@ -84,13 +84,15 @@ public function setOptions($options = array())
*
* @param string $host
* @param int $port
* @param boolean $secure
* @param bool $secure
* @throws AdapterException\RuntimeException
*/
public function connect($host, $port = 80, $secure = false)
{
// If no proxy is set, fall back to Socket adapter
if (! $this->config['proxy_host']) {
return parent::connect($host, $port, $secure);
parent::connect($host, $port, $secure);
return;
}

/* Url might require stream context even if proxy connection doesn't */
Expand All @@ -99,7 +101,7 @@ public function connect($host, $port = 80, $secure = false)
}

// Connect (a non-secure connection) to the proxy server
return parent::connect(
parent::connect(
$this->config['proxy_host'],
$this->config['proxy_port'],
false
Expand All @@ -111,16 +113,16 @@ public function connect($host, $port = 80, $secure = false)
*
* @param string $method
* @param \Zend\Uri\Uri $uri
* @param string $http_ver
* @param string $httpVer
* @param array $headers
* @param string $body
* @throws AdapterException\RuntimeException
* @return string Request as string
*/
public function write($method, $uri, $http_ver = '1.1', $headers = array(), $body = '')
public function write($method, $uri, $httpVer = '1.1', $headers = array(), $body = '')
{
// If no proxy is set, fall back to default Socket adapter
if (! $this->config['proxy_host']) return parent::write($method, $uri, $http_ver, $headers, $body);
if (! $this->config['proxy_host']) return parent::write($method, $uri, $httpVer, $headers, $body);

// Make sure we're properly connected
if (! $this->socket) {
Expand All @@ -130,7 +132,7 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $bod
$host = $this->config['proxy_host'];
$port = $this->config['proxy_port'];

if ($this->connected_to[0] != "tcp://$host" || $this->connected_to[1] != $port) {
if ($this->connectedTo[0] != "tcp://$host" || $this->connectedTo[1] != $port) {
throw new AdapterException\RuntimeException("Trying to write but we are connected to the wrong proxy server");
}

Expand All @@ -143,7 +145,7 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $bod

// if we are proxying HTTPS, preform CONNECT handshake with the proxy
if ($uri->getScheme() == 'https' && (! $this->negotiated)) {
$this->connectHandshake($uri->getHost(), $uri->getPort(), $http_ver, $headers);
$this->connectHandshake($uri->getHost(), $uri->getPort(), $httpVer, $headers);
$this->negotiated = true;
}

Expand All @@ -156,9 +158,9 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $bod
if ($uri->getQuery()) {
$path .= '?' . $uri->getQuery();
}
$request = "$method $path HTTP/$http_ver\r\n";
$request = "$method $path HTTP/$httpVer\r\n";
} else {
$request = "$method $uri HTTP/$http_ver\r\n";
$request = "$method $uri HTTP/$httpVer\r\n";
}

// Add all headers to the request string
Expand Down Expand Up @@ -196,13 +198,13 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $bod
*
* @param string $host
* @param integer $port
* @param string $http_ver
* @param string $httpVer
* @param array $headers
* @throws AdapterException\RuntimeException
*/
protected function connectHandshake($host, $port = 443, $http_ver = '1.1', array &$headers = array())
protected function connectHandshake($host, $port = 443, $httpVer = '1.1', array &$headers = array())
{
$request = "CONNECT $host:$port HTTP/$http_ver\r\n" .
$request = "CONNECT $host:$port HTTP/$httpVer\r\n" .
"Host: " . $this->config['proxy_host'] . "\r\n";

// Add the user-agent header
Expand Down
Loading

0 comments on commit a6c1451

Please sign in to comment.