xpressengine / xe-core

classes/xml/xmlquery/tags/table/HintTableTag.class.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 				, $this->alias ? ', \'' . $dbParser->escape($this->alias) . '\'' : ', null'

 				//, ', \'' . $dbParser->escape($this->index->name) .'\', \'' . $this->index->type .'\''

 		);

-		foreach($this->index as $indx)

+		foreach ($this->index as $indx)

 		{

 			$result .= "new IndexHint(";

 			$result .= '\'' . $dbParser->escape($indx->name) . '\', \'' . $indx->type . '\'' . ') , ';

@@ -54,7 +54,7 @@ 
 

 	function getArguments()

 	{

-		if(!isset($this->conditionsTag))

+		if (!isset($this->conditionsTag))

 		{

 			return array();

 		}

classes/xml/xmlquery/tags/table/TableTag.class.php

Spacing +5 added lines, -5 removed lines

@@ -74,7 +74,7 @@ 
 		$this->name = $dbParser->parseTableName($table->attrs->name);

 

 		$this->alias = $table->attrs->alias;

-		if(!$this->alias)

+		if (!$this->alias)

 		{

 			$this->alias = $table->attrs->name;

 		}

@@ -83,7 +83,7 @@ 
 

 		$this->conditions = $table->conditions;

 

-		if($this->isJoinTable())

+		if ($this->isJoinTable())

 		{

 			$this->conditionsTag = new JoinConditionsTag($this->conditions);

 		}

@@ -92,7 +92,7 @@ 
 	function isJoinTable()

 	{

 		$joinList = array('left join' => 1, 'left outer join' => 1, 'right join' => 1, 'right outer join' => 1);

-		if(isset($joinList[$this->join_type]) && count($this->conditions))

+		if (isset($joinList[$this->join_type]) && count($this->conditions))

 		{

 			return true;

 		}

@@ -119,7 +119,7 @@ 
 	{

 		$dbParser = DB::getParser();

 

-		if($this->isJoinTable())

+		if ($this->isJoinTable())

 		{

 			return sprintf('new JoinTable(\'%s\', \'%s\', "%s", %s)'

 							, $dbParser->escape($this->name)

@@ -133,7 +133,7 @@ 
 

 	function getArguments()

 	{

-		if(!isset($this->conditionsTag))

+		if (!isset($this->conditionsTag))

 		{

 			return array();

 		}

classes/xml/xmlquery/tags/table/TablesTag.class.php

Spacing +11 added lines, -11 removed lines

@@ -38,21 +38,21 @@ 
 		$this->tables = array();

 

 		$xml_tables = $xml_tables_tag->table;

-		if(!is_array($xml_tables))

+		if (!is_array($xml_tables))

 		{

 			$xml_tables = array($xml_tables);

 		}

 

-		if($xml_index_hints_tag)

+		if ($xml_index_hints_tag)

 		{

 			$index_nodes = $xml_index_hints_tag->index;

-			if(!is_array($index_nodes))

+			if (!is_array($index_nodes))

 			{

 				$index_nodes = array($index_nodes);

 			}

-			foreach($index_nodes as $index_node)

+			foreach ($index_nodes as $index_node)

 			{

-				if(!isset($indexes[$index_node->attrs->table]))

+				if (!isset($indexes[$index_node->attrs->table]))

 				{

 					$indexes[$index_node->attrs->table] = array();

 				}

@@ -63,15 +63,15 @@ 
 			}

 		}

 

-		foreach($xml_tables as $tag)

+		foreach ($xml_tables as $tag)

 		{

-			if($tag->attrs->query == 'true')

+			if ($tag->attrs->query == 'true')

 			{

 				$this->tables[] = new QueryTag($tag, true);

 			}

 			else

 			{

-				if(isset($indexes[$tag->attrs->name]) && $indexes[$tag->attrs->name])

+				if (isset($indexes[$tag->attrs->name]) && $indexes[$tag->attrs->name])

 				{

 					$this->tables[] = new HintTableTag($tag, $indexes[$tag->attrs->name]);

 				}

@@ -91,9 +91,9 @@ 
 	function toString()

 	{

 		$output_tables = 'array(' . PHP_EOL;

-		foreach($this->tables as $table)

+		foreach ($this->tables as $table)

 		{

-			if(is_a($table, 'QueryTag'))

+			if (is_a($table, 'QueryTag'))

 			{

 				$output_tables .= $table->toString() . PHP_EOL . ',';

 			}

@@ -110,7 +110,7 @@ 
 	function getArguments()

 	{

 		$arguments = array();

-		foreach($this->tables as $table)

+		foreach ($this->tables as $table)

 		{

 			$arguments = array_merge($arguments, $table->getArguments());

 		}

Braces +3 added lines, -6 removed lines

@@ -68,14 +68,12 @@ 
 			if($tag->attrs->query == 'true')

 			{

 				$this->tables[] = new QueryTag($tag, true);

-			}

-			else

+			} else

 			{

 				if(isset($indexes[$tag->attrs->name]) && $indexes[$tag->attrs->name])

 				{

 					$this->tables[] = new HintTableTag($tag, $indexes[$tag->attrs->name]);

-				}

-				else

+				} else

 				{

 					$this->tables[] = new TableTag($tag);

 				}

@@ -96,8 +94,7 @@ 
 			if(is_a($table, 'QueryTag'))

 			{

 				$output_tables .= $table->toString() . PHP_EOL . ',';

-			}

-			else

+			} else

 			{

 				$output_tables .= $table->getTableString() . PHP_EOL . ',';

 			}

config/config.inc.php

Spacing +29 added lines, -29 removed lines

@@ -7,7 +7,7 @@ 
  * @file   config/config.inc.php
  * @author NAVER (developers@xpressengine.com)
  */
-if(version_compare(PHP_VERSION, '5.4.0', '<'))
+if (version_compare(PHP_VERSION, '5.4.0', '<'))
 {
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING);
 }
@@ -16,7 +16,7 @@ 
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING ^ E_STRICT);
 }
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
@@ -53,7 +53,7 @@ 
 ini_set('session.use_only_cookies', 0);
 
 
-if(file_exists(_XE_PATH_ . 'config/package.inc.php'))
+if (file_exists(_XE_PATH_ . 'config/package.inc.php'))
 {
 	require _XE_PATH_ . 'config/package.inc.php';
 }
@@ -97,12 +97,12 @@ 
  * define('__ENABLE_PHPUNIT_TEST__', 0);
  * define('__PROXY_SERVER__', 'http://domain:port/path');
  */
-if(file_exists(_XE_PATH_ . 'config/config.user.inc.php'))
+if (file_exists(_XE_PATH_ . 'config/config.user.inc.php'))
 {
 	require _XE_PATH_ . 'config/config.user.inc.php';
 }
 
-if(!defined('__DEBUG__'))
+if (!defined('__DEBUG__'))
 {
 	/**
 	 * output debug message(bit value)
@@ -117,7 +117,7 @@ 
 	define('__DEBUG__', 0);
 }
 
-if(!defined('__DEBUG_OUTPUT__'))
+if (!defined('__DEBUG_OUTPUT__'))
 {
 	/**
 	 * output location of debug message
@@ -131,7 +131,7 @@ 
 	define('__DEBUG_OUTPUT__', 0);
 }
 
-if(!defined('__DEBUG_PROTECT__'))
+if (!defined('__DEBUG_PROTECT__'))
 {
 	/**
 	 * output comments of the firePHP console and browser
@@ -144,7 +144,7 @@ 
 	define('__DEBUG_PROTECT__', 1);
 }
 
-if(!defined('__DEBUG_PROTECT_IP__'))
+if (!defined('__DEBUG_PROTECT_IP__'))
 {
 	/**
 	 * Set a ip address to allow debug
@@ -152,7 +152,7 @@ 
 	define('__DEBUG_PROTECT_IP__', '127.0.0.1');
 }
 
-if(!defined('__DEBUG_DB_OUTPUT__'))
+if (!defined('__DEBUG_DB_OUTPUT__'))
 {
 	/**
 	 * DB error message definition
@@ -165,7 +165,7 @@ 
 	define('__DEBUG_DB_OUTPUT__', 0);
 }
 
-if(!defined('__LOG_SLOW_QUERY__'))
+if (!defined('__LOG_SLOW_QUERY__'))
 {
 	/**
 	 * Query log for only timeout query among DB queries
@@ -179,7 +179,7 @@ 
 	define('__LOG_SLOW_QUERY__', 0);
 }
 
-if(!defined('__LOG_SLOW_TRIGGER__'))
+if (!defined('__LOG_SLOW_TRIGGER__'))
 {
 	/**
 	 * Trigger excute time log
@@ -193,7 +193,7 @@ 
 	define('__LOG_SLOW_TRIGGER__', 0);
 }
 
-if(!defined('__LOG_SLOW_ADDON__'))
+if (!defined('__LOG_SLOW_ADDON__'))
 {
 	/**
 	 * Addon excute time log
@@ -207,7 +207,7 @@ 
 	define('__LOG_SLOW_ADDON__', 0);
 }
 
-if(!defined('__LOG_SLOW_WIDGET__'))
+if (!defined('__LOG_SLOW_WIDGET__'))
 {
 	/**
 	 * Widget excute time log
@@ -221,7 +221,7 @@ 
 	define('__LOG_SLOW_WIDGET__', 0);
 }
 
-if(!defined('__DEBUG_QUERY__'))
+if (!defined('__DEBUG_QUERY__'))
 {
 	/**
 	 * Leave DB query information
@@ -234,7 +234,7 @@ 
 	define('__DEBUG_QUERY__', 0);
 }
 
-if(!defined('__OB_GZHANDLER_ENABLE__'))
+if (!defined('__OB_GZHANDLER_ENABLE__'))
 {
 	/**
 	 * option to enable/disable a compression feature using ob_gzhandler
@@ -248,7 +248,7 @@ 
 	define('__OB_GZHANDLER_ENABLE__', 1);
 }
 
-if(!defined('__ENABLE_PHPUNIT_TEST__'))
+if (!defined('__ENABLE_PHPUNIT_TEST__'))
 {
 	/**
 	 * decide to use/not use the php unit test (Path/tests/index.php)
@@ -261,7 +261,7 @@ 
 	define('__ENABLE_PHPUNIT_TEST__', 0);
 }
 
-if(!defined('__PROXY_SERVER__'))
+if (!defined('__PROXY_SERVER__'))
 {
 	/**
 	 * __PROXY_SERVER__ has server information to request to the external through the target server
@@ -271,13 +271,13 @@ 
 }
 
 // Require specific files when using Firebug console output
-if((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1)
+if ((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1)
 {
 	require _XE_PATH_ . 'libs/FirePHPCore/FirePHP.class.php';
 }
 
 // Set Timezone as server time
-if(version_compare(PHP_VERSION, '5.3.0') >= 0)
+if (version_compare(PHP_VERSION, '5.3.0') >= 0)
 {
 	date_default_timezone_set(@date_default_timezone_get());
 }
@@ -285,11 +285,11 @@ 
 // Require a function-defined-file for simple use
 require(_XE_PATH_ . 'config/func.inc.php');
 
-if(__DEBUG__) {
+if (__DEBUG__) {
 	define('__StartTime__', getMicroTime());
 }
 
-if(__DEBUG__) {
+if (__DEBUG__) {
 	$GLOBALS['__elapsed_class_load__'] = 0;
 }
 
@@ -391,38 +391,38 @@ 
 
 function __xe_autoload($class_name)
 {
-	if(__DEBUG__) {
+	if (__DEBUG__) {
 		$time_at = getMicroTime();
 	}
 
-	if(isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
+	if (isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
 	{
 		require _XE_PATH_ . $GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
 	}
-	elseif(preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
+	elseif (preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
 	{
 		$candidate_filename = array();
 		$candidate_filename[] = 'modules/' . $matches[1] . '/' . $matches[1];
-		if(isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
+		if (isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
 		$candidate_filename[] = (isset($matches[3]) && $matches[3]) ? strtolower($matches[3]) : 'class';
 		$candidate_filename[] = 'php';
 
 		$candidate_filename = implode('.', $candidate_filename);
 
-		if(file_exists(_XE_PATH_ . $candidate_filename))
+		if (file_exists(_XE_PATH_ . $candidate_filename))
 		{
 			require _XE_PATH_ . $candidate_filename;
 		}
 	}
 
-	if(__DEBUG__) {
+	if (__DEBUG__) {
 		$GLOBALS['__elapsed_class_load__'] += getMicroTime() - $time_at;
 	}
 }
 spl_autoload_register('__xe_autoload');
 
-if(file_exists(_XE_PATH_  . '/vendor/autoload.php')) {
-	require _XE_PATH_  . '/vendor/autoload.php';
+if (file_exists(_XE_PATH_ . '/vendor/autoload.php')) {
+	require _XE_PATH_ . '/vendor/autoload.php';
 }
 /* End of file config.inc.php */
 /* Location: ./config/config.inc.php */

Braces +6 added lines, -7 removed lines

@@ -10,8 +10,7 @@ 
 if(version_compare(PHP_VERSION, '5.4.0', '<'))
 {
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING);
-}
-else
+} else
 {
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING ^ E_STRICT);
 }
@@ -56,8 +55,7 @@ 
 if(file_exists(_XE_PATH_ . 'config/package.inc.php'))
 {
 	require _XE_PATH_ . 'config/package.inc.php';
-}
-else
+} else
 {
 	/**
 	 * Package type
@@ -398,12 +396,13 @@ 
 	if(isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
 	{
 		require _XE_PATH_ . $GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
-	}
-	elseif(preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
+	} elseif(preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
 	{
 		$candidate_filename = array();
 		$candidate_filename[] = 'modules/' . $matches[1] . '/' . $matches[1];
-		if(isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
+		if(isset($matches[2]) && $matches[2]) {
+			$candidate_filename[] = 'admin';
+		}
 		$candidate_filename[] = (isset($matches[3]) && $matches[3]) ? strtolower($matches[3]) : 'class';
 		$candidate_filename[] = 'php';
 

index.php

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 /**
  * @brief Declare constants for generic use and for checking to avoid a direct call from the Web
  **/
-define('__XE__',   TRUE);
+define('__XE__', TRUE);
 /**
  * @brief Include the necessary configuration files
  **/
@@ -48,18 +48,18 @@ 
 /**
  * @brief If default_url is set and it is different from the current url, attempt to redirect for SSO authentication and then process the module
  **/
-if($oContext->checkSSO())
+if ($oContext->checkSSO())
 {
 	$oModuleHandler = new ModuleHandler();
 
 	try
 	{
-		if($oModuleHandler->init())
+		if ($oModuleHandler->init())
 		{
 			$oModuleHandler->displayContent($oModuleHandler->procModule());
 		}
 	}
-	catch(Exception $e)
+	catch (Exception $e)
 	{
 		htmlHeader();
 		echo Context::getLang($e->getMessage());

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		{
 			$oModuleHandler->displayContent($oModuleHandler->procModule());
 		}
-	}
-	catch(Exception $e)
+	} catch(Exception $e)
 	{
 		htmlHeader();
 		echo Context::getLang($e->getMessage());

libs/PEAR.1.9.5/HTTP/Request2/Adapter.php

Indentation +103 added lines, -103 removed lines

@@ -1,22 +1,22 @@ 
 <?php

 /**

- * Base class for HTTP_Request2 adapters

- *

- * PHP version 5

- *

- * LICENSE

- *

- * This source file is subject to BSD 3-Clause License that is bundled

- * with this package in the file LICENSE and available at the URL

- * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE

- *

- * @category  HTTP

- * @package   HTTP_Request2

- * @author    Alexey Borzov <avb@php.net>

- * @copyright 2008-2014 Alexey Borzov <avb@php.net>

- * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License

- * @link      http://pear.php.net/package/HTTP_Request2

- */

+	 * Base class for HTTP_Request2 adapters

+	 *

+	 * PHP version 5

+	 *

+	 * LICENSE

+	 *

+	 * This source file is subject to BSD 3-Clause License that is bundled

+	 * with this package in the file LICENSE and available at the URL

+	 * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE

+	 *

+	 * @category  HTTP

+	 * @package   HTTP_Request2

+	 * @author    Alexey Borzov <avb@php.net>

+	 * @copyright 2008-2014 Alexey Borzov <avb@php.net>

+	 * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License

+	 * @link      http://pear.php.net/package/HTTP_Request2

+	 */

 

 /**

  * Class representing a HTTP response

@@ -39,99 +39,99 @@ 
  */

 abstract class HTTP_Request2_Adapter

 {

-    /**

-     * A list of methods that MUST NOT have a request body, per RFC 2616

-     * @var  array

-     */

-    protected static $bodyDisallowed = array('TRACE');

+	/**

+	 * A list of methods that MUST NOT have a request body, per RFC 2616

+	 * @var  array

+	 */

+	protected static $bodyDisallowed = array('TRACE');

 

-    /**

-     * Methods having defined semantics for request body

-     *

-     * Content-Length header (indicating that the body follows, section 4.3 of

-     * RFC 2616) will be sent for these methods even if no body was added

-     *

-     * @var  array

-     * @link http://pear.php.net/bugs/bug.php?id=12900

-     * @link http://pear.php.net/bugs/bug.php?id=14740

-     */

-    protected static $bodyRequired = array('POST', 'PUT');

+	/**

+	 * Methods having defined semantics for request body

+	 *

+	 * Content-Length header (indicating that the body follows, section 4.3 of

+	 * RFC 2616) will be sent for these methods even if no body was added

+	 *

+	 * @var  array

+	 * @link http://pear.php.net/bugs/bug.php?id=12900

+	 * @link http://pear.php.net/bugs/bug.php?id=14740

+	 */

+	protected static $bodyRequired = array('POST', 'PUT');

 

-    /**

-     * Request being sent

-     * @var  HTTP_Request2

-     */

-    protected $request;

+	/**

+	 * Request being sent

+	 * @var  HTTP_Request2

+	 */

+	protected $request;

 

-    /**

-     * Request body

-     * @var  string|resource|HTTP_Request2_MultipartBody

-     * @see  HTTP_Request2::getBody()

-     */

-    protected $requestBody;

+	/**

+	 * Request body

+	 * @var  string|resource|HTTP_Request2_MultipartBody

+	 * @see  HTTP_Request2::getBody()

+	 */

+	protected $requestBody;

 

-    /**

-     * Length of the request body

-     * @var  integer

-     */

-    protected $contentLength;

+	/**

+	 * Length of the request body

+	 * @var  integer

+	 */

+	protected $contentLength;

 

-    /**

-     * Sends request to the remote server and returns its response

-     *

-     * @param HTTP_Request2 $request HTTP request message

-     *

-     * @return   HTTP_Request2_Response

-     * @throws   HTTP_Request2_Exception

-     */

-    abstract public function sendRequest(HTTP_Request2 $request);

+	/**

+	 * Sends request to the remote server and returns its response

+	 *

+	 * @param HTTP_Request2 $request HTTP request message

+	 *

+	 * @return   HTTP_Request2_Response

+	 * @throws   HTTP_Request2_Exception

+	 */

+	abstract public function sendRequest(HTTP_Request2 $request);

 

-    /**

-     * Calculates length of the request body, adds proper headers

-     *

-     * @param array &$headers associative array of request headers, this method

-     *                        will add proper 'Content-Length' and 'Content-Type'

-     *                        headers to this array (or remove them if not needed)

-     */

-    protected function calculateRequestLength(&$headers)

-    {

-        $this->requestBody = $this->request->getBody();

+	/**

+	 * Calculates length of the request body, adds proper headers

+	 *

+	 * @param array &$headers associative array of request headers, this method

+	 *                        will add proper 'Content-Length' and 'Content-Type'

+	 *                        headers to this array (or remove them if not needed)

+	 */

+	protected function calculateRequestLength(&$headers)

+	{

+		$this->requestBody = $this->request->getBody();

 

-        if (is_string($this->requestBody)) {

-            $this->contentLength = strlen($this->requestBody);

-        } elseif (is_resource($this->requestBody)) {

-            $stat = fstat($this->requestBody);

-            $this->contentLength = $stat['size'];

-            rewind($this->requestBody);

-        } else {

-            $this->contentLength = $this->requestBody->getLength();

-            $headers['content-type'] = 'multipart/form-data; boundary=' .

-                                       $this->requestBody->getBoundary();

-            $this->requestBody->rewind();

-        }

+		if (is_string($this->requestBody)) {

+			$this->contentLength = strlen($this->requestBody);

+		} elseif (is_resource($this->requestBody)) {

+			$stat = fstat($this->requestBody);

+			$this->contentLength = $stat['size'];

+			rewind($this->requestBody);

+		} else {

+			$this->contentLength = $this->requestBody->getLength();

+			$headers['content-type'] = 'multipart/form-data; boundary=' .

+									   $this->requestBody->getBoundary();

+			$this->requestBody->rewind();

+		}

 

-        if (in_array($this->request->getMethod(), self::$bodyDisallowed)

-            || 0 == $this->contentLength

-        ) {

-            // No body: send a Content-Length header nonetheless (request #12900),

-            // but do that only for methods that require a body (bug #14740)

-            if (in_array($this->request->getMethod(), self::$bodyRequired)) {

-                $headers['content-length'] = 0;

-            } else {

-                unset($headers['content-length']);

-                // if the method doesn't require a body and doesn't have a

-                // body, don't send a Content-Type header. (request #16799)

-                unset($headers['content-type']);

-            }

-        } else {

-            if (empty($headers['content-type'])) {

-                $headers['content-type'] = 'application/x-www-form-urlencoded';

-            }

-            // Content-Length should not be sent for chunked Transfer-Encoding (bug #20125)

-            if (!isset($headers['transfer-encoding'])) {

-                $headers['content-length'] = $this->contentLength;

-            }

-        }

-    }

+		if (in_array($this->request->getMethod(), self::$bodyDisallowed)

+			|| 0 == $this->contentLength

+		) {

+			// No body: send a Content-Length header nonetheless (request #12900),

+			// but do that only for methods that require a body (bug #14740)

+			if (in_array($this->request->getMethod(), self::$bodyRequired)) {

+				$headers['content-length'] = 0;

+			} else {

+				unset($headers['content-length']);

+				// if the method doesn't require a body and doesn't have a

+				// body, don't send a Content-Type header. (request #16799)

+				unset($headers['content-type']);

+			}

+		} else {

+			if (empty($headers['content-type'])) {

+				$headers['content-type'] = 'application/x-www-form-urlencoded';

+			}

+			// Content-Length should not be sent for chunked Transfer-Encoding (bug #20125)

+			if (!isset($headers['transfer-encoding'])) {

+				$headers['content-length'] = $this->contentLength;

+			}

+		}

+	}

 }

 ?>

libs/PEAR.1.9.5/HTTP/Request2/Adapter/Curl.php

Indentation +545 added lines, -545 removed lines

@@ -1,22 +1,22 @@ 
 <?php

 /**

- * Adapter for HTTP_Request2 wrapping around cURL extension

- *

- * PHP version 5

- *

- * LICENSE

- *

- * This source file is subject to BSD 3-Clause License that is bundled

- * with this package in the file LICENSE and available at the URL

- * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE

- *

- * @category  HTTP

- * @package   HTTP_Request2

- * @author    Alexey Borzov <avb@php.net>

- * @copyright 2008-2014 Alexey Borzov <avb@php.net>

- * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License

- * @link      http://pear.php.net/package/HTTP_Request2

- */

+	 * Adapter for HTTP_Request2 wrapping around cURL extension

+	 *

+	 * PHP version 5

+	 *

+	 * LICENSE

+	 *

+	 * This source file is subject to BSD 3-Clause License that is bundled

+	 * with this package in the file LICENSE and available at the URL

+	 * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE

+	 *

+	 * @category  HTTP

+	 * @package   HTTP_Request2

+	 * @author    Alexey Borzov <avb@php.net>

+	 * @copyright 2008-2014 Alexey Borzov <avb@php.net>

+	 * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License

+	 * @link      http://pear.php.net/package/HTTP_Request2

+	 */

 

 /**

  * Base class for HTTP_Request2 adapters

@@ -35,533 +35,533 @@ 
  */

 class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter

 {

-    /**

-     * Mapping of header names to cURL options

-     * @var  array

-     */

-    protected static $headerMap = array(

-        'accept-encoding' => CURLOPT_ENCODING,

-        'cookie'          => CURLOPT_COOKIE,

-        'referer'         => CURLOPT_REFERER,

-        'user-agent'      => CURLOPT_USERAGENT

-    );

-

-    /**

-     * Mapping of SSL context options to cURL options

-     * @var  array

-     */

-    protected static $sslContextMap = array(

-        'ssl_verify_peer' => CURLOPT_SSL_VERIFYPEER,

-        'ssl_cafile'      => CURLOPT_CAINFO,

-        'ssl_capath'      => CURLOPT_CAPATH,

-        'ssl_local_cert'  => CURLOPT_SSLCERT,

-        'ssl_passphrase'  => CURLOPT_SSLCERTPASSWD

-    );

-

-    /**

-     * Mapping of CURLE_* constants to Exception subclasses and error codes

-     * @var  array

-     */

-    protected static $errorMap = array(

-        CURLE_UNSUPPORTED_PROTOCOL  => array('HTTP_Request2_MessageException',

-                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),

-        CURLE_COULDNT_RESOLVE_PROXY => array('HTTP_Request2_ConnectionException'),

-        CURLE_COULDNT_RESOLVE_HOST  => array('HTTP_Request2_ConnectionException'),

-        CURLE_COULDNT_CONNECT       => array('HTTP_Request2_ConnectionException'),

-        // error returned from write callback

-        CURLE_WRITE_ERROR           => array('HTTP_Request2_MessageException',

-                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),

-        CURLE_OPERATION_TIMEOUTED   => array('HTTP_Request2_MessageException',

-                                             HTTP_Request2_Exception::TIMEOUT),

-        CURLE_HTTP_RANGE_ERROR      => array('HTTP_Request2_MessageException'),

-        CURLE_SSL_CONNECT_ERROR     => array('HTTP_Request2_ConnectionException'),

-        CURLE_LIBRARY_NOT_FOUND     => array('HTTP_Request2_LogicException',

-                                             HTTP_Request2_Exception::MISCONFIGURATION),

-        CURLE_FUNCTION_NOT_FOUND    => array('HTTP_Request2_LogicException',

-                                             HTTP_Request2_Exception::MISCONFIGURATION),

-        CURLE_ABORTED_BY_CALLBACK   => array('HTTP_Request2_MessageException',

-                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),

-        CURLE_TOO_MANY_REDIRECTS    => array('HTTP_Request2_MessageException',

-                                             HTTP_Request2_Exception::TOO_MANY_REDIRECTS),

-        CURLE_SSL_PEER_CERTIFICATE  => array('HTTP_Request2_ConnectionException'),

-        CURLE_GOT_NOTHING           => array('HTTP_Request2_MessageException'),

-        CURLE_SSL_ENGINE_NOTFOUND   => array('HTTP_Request2_LogicException',

-                                             HTTP_Request2_Exception::MISCONFIGURATION),

-        CURLE_SSL_ENGINE_SETFAILED  => array('HTTP_Request2_LogicException',

-                                             HTTP_Request2_Exception::MISCONFIGURATION),

-        CURLE_SEND_ERROR            => array('HTTP_Request2_MessageException'),

-        CURLE_RECV_ERROR            => array('HTTP_Request2_MessageException'),

-        CURLE_SSL_CERTPROBLEM       => array('HTTP_Request2_LogicException',

-                                             HTTP_Request2_Exception::INVALID_ARGUMENT),

-        CURLE_SSL_CIPHER            => array('HTTP_Request2_ConnectionException'),

-        CURLE_SSL_CACERT            => array('HTTP_Request2_ConnectionException'),

-        CURLE_BAD_CONTENT_ENCODING  => array('HTTP_Request2_MessageException'),

-    );

-

-    /**

-     * Response being received

-     * @var  HTTP_Request2_Response

-     */

-    protected $response;

-

-    /**

-     * Whether 'sentHeaders' event was sent to observers

-     * @var  boolean

-     */

-    protected $eventSentHeaders = false;

-

-    /**

-     * Whether 'receivedHeaders' event was sent to observers

-     * @var boolean

-     */

-    protected $eventReceivedHeaders = false;

-

-    /**

-     * Position within request body

-     * @var  integer

-     * @see  callbackReadBody()

-     */

-    protected $position = 0;

-

-    /**

-     * Information about last transfer, as returned by curl_getinfo()

-     * @var  array

-     */

-    protected $lastInfo;

-

-    /**

-     * Creates a subclass of HTTP_Request2_Exception from curl error data

-     *

-     * @param resource $ch curl handle

-     *

-     * @return HTTP_Request2_Exception

-     */

-    protected static function wrapCurlError($ch)

-    {

-        $nativeCode = curl_errno($ch);

-        $message    = 'Curl error: ' . curl_error($ch);

-        if (!isset(self::$errorMap[$nativeCode])) {

-            return new HTTP_Request2_Exception($message, 0, $nativeCode);

-        } else {

-            $class = self::$errorMap[$nativeCode][0];

-            $code  = empty(self::$errorMap[$nativeCode][1])

-                     ? 0 : self::$errorMap[$nativeCode][1];

-            return new $class($message, $code, $nativeCode);

-        }

-    }

-

-    /**

-     * Sends request to the remote server and returns its response

-     *

-     * @param HTTP_Request2 $request HTTP request message

-     *

-     * @return   HTTP_Request2_Response

-     * @throws   HTTP_Request2_Exception

-     */

-    public function sendRequest(HTTP_Request2 $request)

-    {

-        if (!extension_loaded('curl')) {

-            throw new HTTP_Request2_LogicException(

-                'cURL extension not available', HTTP_Request2_Exception::MISCONFIGURATION

-            );

-        }

-

-        $this->request              = $request;

-        $this->response             = null;

-        $this->position             = 0;

-        $this->eventSentHeaders     = false;

-        $this->eventReceivedHeaders = false;

-

-        try {

-            if (false === curl_exec($ch = $this->createCurlHandle())) {

-                $e = self::wrapCurlError($ch);

-            }

-        } catch (Exception $e) {

-        }

-        if (isset($ch)) {

-            $this->lastInfo = curl_getinfo($ch);

-            curl_close($ch);

-        }

-

-        $response = $this->response;

-        unset($this->request, $this->requestBody, $this->response);

-

-        if (!empty($e)) {

-            throw $e;

-        }

-

-        if ($jar = $request->getCookieJar()) {

-            $jar->addCookiesFromResponse($response, $request->getUrl());

-        }

-

-        if (0 < $this->lastInfo['size_download']) {

-            $request->setLastEvent('receivedBody', $response);

-        }

-        return $response;

-    }

-

-    /**

-     * Returns information about last transfer

-     *

-     * @return   array   associative array as returned by curl_getinfo()

-     */

-    public function getInfo()

-    {

-        return $this->lastInfo;

-    }

-

-    /**

-     * Creates a new cURL handle and populates it with data from the request

-     *

-     * @return   resource    a cURL handle, as created by curl_init()

-     * @throws   HTTP_Request2_LogicException

-     * @throws   HTTP_Request2_NotImplementedException

-     */

-    protected function createCurlHandle()

-    {

-        $ch = curl_init();

-

-        curl_setopt_array($ch, array(

-            // setup write callbacks

-            CURLOPT_HEADERFUNCTION => array($this, 'callbackWriteHeader'),

-            CURLOPT_WRITEFUNCTION  => array($this, 'callbackWriteBody'),

-            // buffer size

-            CURLOPT_BUFFERSIZE     => $this->request->getConfig('buffer_size'),

-            // connection timeout

-            CURLOPT_CONNECTTIMEOUT => $this->request->getConfig('connect_timeout'),

-            // save full outgoing headers, in case someone is interested

-            CURLINFO_HEADER_OUT    => true,

-            // request url

-            CURLOPT_URL            => $this->request->getUrl()->getUrl()

-        ));

-

-        // set up redirects

-        if (!$this->request->getConfig('follow_redirects')) {

-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);

-        } else {

-            if (!@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true)) {

-                throw new HTTP_Request2_LogicException(

-                    'Redirect support in curl is unavailable due to open_basedir or safe_mode setting',

-                    HTTP_Request2_Exception::MISCONFIGURATION

-                );

-            }

-            curl_setopt($ch, CURLOPT_MAXREDIRS, $this->request->getConfig('max_redirects'));

-            // limit redirects to http(s), works in 5.2.10+

-            if (defined('CURLOPT_REDIR_PROTOCOLS')) {

-                curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);

-            }

-            // works in 5.3.2+, http://bugs.php.net/bug.php?id=49571

-            if ($this->request->getConfig('strict_redirects') && defined('CURLOPT_POSTREDIR')) {

-                curl_setopt($ch, CURLOPT_POSTREDIR, 3);

-            }

-        }

-

-        // set local IP via CURLOPT_INTERFACE (request #19515)

-        if ($ip = $this->request->getConfig('local_ip')) {

-            curl_setopt($ch, CURLOPT_INTERFACE, $ip);

-        }

-

-        // request timeout

-        if ($timeout = $this->request->getConfig('timeout')) {

-            curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);

-        }

-

-        // set HTTP version

-        switch ($this->request->getConfig('protocol_version')) {

-        case '1.0':

-            curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);

-            break;

-        case '1.1':

-            curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);

-        }

-

-        // set request method

-        switch ($this->request->getMethod()) {

-        case HTTP_Request2::METHOD_GET:

-            curl_setopt($ch, CURLOPT_HTTPGET, true);

-            break;

-        case HTTP_Request2::METHOD_POST:

-            curl_setopt($ch, CURLOPT_POST, true);

-            break;

-        case HTTP_Request2::METHOD_HEAD:

-            curl_setopt($ch, CURLOPT_NOBODY, true);

-            break;

-        case HTTP_Request2::METHOD_PUT:

-            curl_setopt($ch, CURLOPT_UPLOAD, true);

-            break;

-        default:

-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());

-        }

-

-        // set proxy, if needed

-        if ($host = $this->request->getConfig('proxy_host')) {

-            if (!($port = $this->request->getConfig('proxy_port'))) {

-                throw new HTTP_Request2_LogicException(

-                    'Proxy port not provided', HTTP_Request2_Exception::MISSING_VALUE

-                );

-            }

-            curl_setopt($ch, CURLOPT_PROXY, $host . ':' . $port);

-            if ($user = $this->request->getConfig('proxy_user')) {

-                curl_setopt(

-                    $ch, CURLOPT_PROXYUSERPWD,

-                    $user . ':' . $this->request->getConfig('proxy_password')

-                );

-                switch ($this->request->getConfig('proxy_auth_scheme')) {

-                case HTTP_Request2::AUTH_BASIC:

-                    curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);

-                    break;

-                case HTTP_Request2::AUTH_DIGEST:

-                    curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);

-                }

-            }

-            if ($type = $this->request->getConfig('proxy_type')) {

-                switch ($type) {

-                case 'http':

-                    curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);

-                    break;

-                case 'socks5':

-                    curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);

-                    break;

-                default:

-                    throw new HTTP_Request2_NotImplementedException(

-                        "Proxy type '{$type}' is not supported"

-                    );

-                }

-            }

-        }

-

-        // set authentication data

-        if ($auth = $this->request->getAuth()) {

-            curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);

-            switch ($auth['scheme']) {

-            case HTTP_Request2::AUTH_BASIC:

-                curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);

-                break;

-            case HTTP_Request2::AUTH_DIGEST:

-                curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);

-            }

-        }

-

-        // set SSL options

-        foreach ($this->request->getConfig() as $name => $value) {

-            if ('ssl_verify_host' == $name && null !== $value) {

-                curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);

-            } elseif (isset(self::$sslContextMap[$name]) && null !== $value) {

-                curl_setopt($ch, self::$sslContextMap[$name], $value);

-            }

-        }

-

-        $headers = $this->request->getHeaders();

-        // make cURL automagically send proper header

-        if (!isset($headers['accept-encoding'])) {

-            $headers['accept-encoding'] = '';

-        }

-

-        if (($jar = $this->request->getCookieJar())

-            && ($cookies = $jar->getMatching($this->request->getUrl(), true))

-        ) {

-            $headers['cookie'] = (empty($headers['cookie'])? '': $headers['cookie'] . '; ') . $cookies;

-        }

-

-        // set headers having special cURL keys

-        foreach (self::$headerMap as $name => $option) {

-            if (isset($headers[$name])) {

-                curl_setopt($ch, $option, $headers[$name]);

-                unset($headers[$name]);

-            }

-        }

-

-        $this->calculateRequestLength($headers);

-        if (isset($headers['content-length']) || isset($headers['transfer-encoding'])) {

-            $this->workaroundPhpBug47204($ch, $headers);

-        }

-

-        // set headers not having special keys

-        $headersFmt = array();

-        foreach ($headers as $name => $value) {

-            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));

-            $headersFmt[]  = $canonicalName . ': ' . $value;

-        }

-        curl_setopt($ch, CURLOPT_HTTPHEADER, $headersFmt);

-

-        return $ch;

-    }

-

-    /**

-     * Workaround for PHP bug #47204 that prevents rewinding request body

-     *

-     * The workaround consists of reading the entire request body into memory

-     * and setting it as CURLOPT_POSTFIELDS, so it isn't recommended for large

-     * file uploads, use Socket adapter instead.

-     *

-     * @param resource $ch       cURL handle

-     * @param array    &$headers Request headers

-     */

-    protected function workaroundPhpBug47204($ch, &$headers)

-    {

-        // no redirects, no digest auth -> probably no rewind needed

-        if (!$this->request->getConfig('follow_redirects')

-            && (!($auth = $this->request->getAuth())

-                || HTTP_Request2::AUTH_DIGEST != $auth['scheme'])

-        ) {

-            curl_setopt($ch, CURLOPT_READFUNCTION, array($this, 'callbackReadBody'));

-

-        } else {

-            // rewind may be needed, read the whole body into memory

-            if ($this->requestBody instanceof HTTP_Request2_MultipartBody) {

-                $this->requestBody = $this->requestBody->__toString();

-

-            } elseif (is_resource($this->requestBody)) {

-                $fp = $this->requestBody;

-                $this->requestBody = '';

-                while (!feof($fp)) {

-                    $this->requestBody .= fread($fp, 16384);

-                }

-            }

-            // curl hangs up if content-length is present

-            unset($headers['content-length']);

-            curl_setopt($ch, CURLOPT_POSTFIELDS, $this->requestBody);

-        }

-    }

-

-    /**

-     * Callback function called by cURL for reading the request body

-     *

-     * @param resource $ch     cURL handle

-     * @param resource $fd     file descriptor (not used)

-     * @param integer  $length maximum length of data to return

-     *

-     * @return   string      part of the request body, up to $length bytes

-     */

-    protected function callbackReadBody($ch, $fd, $length)

-    {

-        if (!$this->eventSentHeaders) {

-            $this->request->setLastEvent(

-                'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)

-            );

-            $this->eventSentHeaders = true;

-        }

-        if (in_array($this->request->getMethod(), self::$bodyDisallowed)

-            || 0 == $this->contentLength || $this->position >= $this->contentLength

-        ) {

-            return '';

-        }

-        if (is_string($this->requestBody)) {

-            $string = substr($this->requestBody, $this->position, $length);

-        } elseif (is_resource($this->requestBody)) {

-            $string = fread($this->requestBody, $length);

-        } else {

-            $string = $this->requestBody->read($length);

-        }

-        $this->request->setLastEvent('sentBodyPart', strlen($string));

-        $this->position += strlen($string);

-        return $string;

-    }

-

-    /**

-     * Callback function called by cURL for saving the response headers

-     *

-     * @param resource $ch     cURL handle

-     * @param string   $string response header (with trailing CRLF)

-     *

-     * @return   integer     number of bytes saved

-     * @see      HTTP_Request2_Response::parseHeaderLine()

-     */

-    protected function callbackWriteHeader($ch, $string)

-    {

-        // we may receive a second set of headers if doing e.g. digest auth

-        if ($this->eventReceivedHeaders || !$this->eventSentHeaders) {

-            // don't bother with 100-Continue responses (bug #15785)

-            if (!$this->eventSentHeaders

-                || $this->response->getStatus() >= 200

-            ) {

-                $this->request->setLastEvent(

-                    'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)

-                );

-            }

-            $upload = curl_getinfo($ch, CURLINFO_SIZE_UPLOAD);

-            // if body wasn't read by a callback, send event with total body size

-            if ($upload > $this->position) {

-                $this->request->setLastEvent(

-                    'sentBodyPart', $upload - $this->position

-                );

-                $this->position = $upload;

-            }

-            if ($upload && (!$this->eventSentHeaders

-                            || $this->response->getStatus() >= 200)

-            ) {

-                $this->request->setLastEvent('sentBody', $upload);

-            }

-            $this->eventSentHeaders = true;

-            // we'll need a new response object

-            if ($this->eventReceivedHeaders) {

-                $this->eventReceivedHeaders = false;

-                $this->response             = null;

-            }

-        }

-        if (empty($this->response)) {

-            $this->response = new HTTP_Request2_Response(

-                $string, false, curl_getinfo($ch, CURLINFO_EFFECTIVE_URL)

-            );

-        } else {

-            $this->response->parseHeaderLine($string);

-            if ('' == trim($string)) {

-                // don't bother with 100-Continue responses (bug #15785)

-                if (200 <= $this->response->getStatus()) {

-                    $this->request->setLastEvent('receivedHeaders', $this->response);

-                }

-

-                if ($this->request->getConfig('follow_redirects') && $this->response->isRedirect()) {

-                    $redirectUrl = new Net_URL2($this->response->getHeader('location'));

-

-                    // for versions lower than 5.2.10, check the redirection URL protocol

-                    if (!defined('CURLOPT_REDIR_PROTOCOLS') && $redirectUrl->isAbsolute()

-                        && !in_array($redirectUrl->getScheme(), array('http', 'https'))

-                    ) {

-                        return -1;

-                    }

-

-                    if ($jar = $this->request->getCookieJar()) {

-                        $jar->addCookiesFromResponse($this->response, $this->request->getUrl());

-                        if (!$redirectUrl->isAbsolute()) {

-                            $redirectUrl = $this->request->getUrl()->resolve($redirectUrl);

-                        }

-                        if ($cookies = $jar->getMatching($redirectUrl, true)) {

-                            curl_setopt($ch, CURLOPT_COOKIE, $cookies);

-                        }

-                    }

-                }

-                $this->eventReceivedHeaders = true;

-            }

-        }

-        return strlen($string);

-    }

-

-    /**

-     * Callback function called by cURL for saving the response body

-     *

-     * @param resource $ch     cURL handle (not used)

-     * @param string   $string part of the response body

-     *

-     * @return   integer     number of bytes saved

-     * @throws   HTTP_Request2_MessageException

-     * @see      HTTP_Request2_Response::appendBody()

-     */

-    protected function callbackWriteBody($ch, $string)

-    {

-        // cURL calls WRITEFUNCTION callback without calling HEADERFUNCTION if

-        // response doesn't start with proper HTTP status line (see bug #15716)

-        if (empty($this->response)) {

-            throw new HTTP_Request2_MessageException(

-                "Malformed response: {$string}",

-                HTTP_Request2_Exception::MALFORMED_RESPONSE

-            );

-        }

-        if ($this->request->getConfig('store_body')) {

-            $this->response->appendBody($string);

-        }

-        $this->request->setLastEvent('receivedBodyPart', $string);

-        return strlen($string);

-    }

+	/**

+	 * Mapping of header names to cURL options

+	 * @var  array

+	 */

+	protected static $headerMap = array(

+		'accept-encoding' => CURLOPT_ENCODING,

+		'cookie'          => CURLOPT_COOKIE,

+		'referer'         => CURLOPT_REFERER,

+		'user-agent'      => CURLOPT_USERAGENT

+	);

+

+	/**

+	 * Mapping of SSL context options to cURL options

+	 * @var  array

+	 */

+	protected static $sslContextMap = array(

+		'ssl_verify_peer' => CURLOPT_SSL_VERIFYPEER,

+		'ssl_cafile'      => CURLOPT_CAINFO,

+		'ssl_capath'      => CURLOPT_CAPATH,

+		'ssl_local_cert'  => CURLOPT_SSLCERT,

+		'ssl_passphrase'  => CURLOPT_SSLCERTPASSWD

+	);

+

+	/**

+	 * Mapping of CURLE_* constants to Exception subclasses and error codes

+	 * @var  array

+	 */

+	protected static $errorMap = array(

+		CURLE_UNSUPPORTED_PROTOCOL  => array('HTTP_Request2_MessageException',

+											 HTTP_Request2_Exception::NON_HTTP_REDIRECT),

+		CURLE_COULDNT_RESOLVE_PROXY => array('HTTP_Request2_ConnectionException'),

+		CURLE_COULDNT_RESOLVE_HOST  => array('HTTP_Request2_ConnectionException'),

+		CURLE_COULDNT_CONNECT       => array('HTTP_Request2_ConnectionException'),

+		// error returned from write callback

+		CURLE_WRITE_ERROR           => array('HTTP_Request2_MessageException',

+											 HTTP_Request2_Exception::NON_HTTP_REDIRECT),

+		CURLE_OPERATION_TIMEOUTED   => array('HTTP_Request2_MessageException',

+											 HTTP_Request2_Exception::TIMEOUT),

+		CURLE_HTTP_RANGE_ERROR      => array('HTTP_Request2_MessageException'),

+		CURLE_SSL_CONNECT_ERROR     => array('HTTP_Request2_ConnectionException'),

+		CURLE_LIBRARY_NOT_FOUND     => array('HTTP_Request2_LogicException',

+											 HTTP_Request2_Exception::MISCONFIGURATION),

+		CURLE_FUNCTION_NOT_FOUND    => array('HTTP_Request2_LogicException',

+											 HTTP_Request2_Exception::MISCONFIGURATION),

+		CURLE_ABORTED_BY_CALLBACK   => array('HTTP_Request2_MessageException',

+											 HTTP_Request2_Exception::NON_HTTP_REDIRECT),

+		CURLE_TOO_MANY_REDIRECTS    => array('HTTP_Request2_MessageException',

+											 HTTP_Request2_Exception::TOO_MANY_REDIRECTS),

+		CURLE_SSL_PEER_CERTIFICATE  => array('HTTP_Request2_ConnectionException'),

+		CURLE_GOT_NOTHING           => array('HTTP_Request2_MessageException'),

+		CURLE_SSL_ENGINE_NOTFOUND   => array('HTTP_Request2_LogicException',

+											 HTTP_Request2_Exception::MISCONFIGURATION),

+		CURLE_SSL_ENGINE_SETFAILED  => array('HTTP_Request2_LogicException',

+											 HTTP_Request2_Exception::MISCONFIGURATION),

+		CURLE_SEND_ERROR            => array('HTTP_Request2_MessageException'),

+		CURLE_RECV_ERROR            => array('HTTP_Request2_MessageException'),

+		CURLE_SSL_CERTPROBLEM       => array('HTTP_Request2_LogicException',

+											 HTTP_Request2_Exception::INVALID_ARGUMENT),

+		CURLE_SSL_CIPHER            => array('HTTP_Request2_ConnectionException'),

+		CURLE_SSL_CACERT            => array('HTTP_Request2_ConnectionException'),

+		CURLE_BAD_CONTENT_ENCODING  => array('HTTP_Request2_MessageException'),

+	);

+

+	/**

+	 * Response being received

+	 * @var  HTTP_Request2_Response

+	 */

+	protected $response;

+

+	/**

+	 * Whether 'sentHeaders' event was sent to observers

+	 * @var  boolean

+	 */

+	protected $eventSentHeaders = false;

+

+	/**

+	 * Whether 'receivedHeaders' event was sent to observers

+	 * @var boolean

+	 */

+	protected $eventReceivedHeaders = false;

+

+	/**

+	 * Position within request body

+	 * @var  integer

+	 * @see  callbackReadBody()

+	 */

+	protected $position = 0;

+

+	/**

+	 * Information about last transfer, as returned by curl_getinfo()

+	 * @var  array

+	 */

+	protected $lastInfo;

+

+	/**

+	 * Creates a subclass of HTTP_Request2_Exception from curl error data

+	 *

+	 * @param resource $ch curl handle

+	 *

+	 * @return HTTP_Request2_Exception

+	 */

+	protected static function wrapCurlError($ch)

+	{

+		$nativeCode = curl_errno($ch);

+		$message    = 'Curl error: ' . curl_error($ch);

+		if (!isset(self::$errorMap[$nativeCode])) {

+			return new HTTP_Request2_Exception($message, 0, $nativeCode);

+		} else {

+			$class = self::$errorMap[$nativeCode][0];

+			$code  = empty(self::$errorMap[$nativeCode][1])

+					 ? 0 : self::$errorMap[$nativeCode][1];

+			return new $class($message, $code, $nativeCode);

+		}

+	}

+

+	/**

+	 * Sends request to the remote server and returns its response

+	 *

+	 * @param HTTP_Request2 $request HTTP request message

+	 *

+	 * @return   HTTP_Request2_Response

+	 * @throws   HTTP_Request2_Exception

+	 */

+	public function sendRequest(HTTP_Request2 $request)

+	{

+		if (!extension_loaded('curl')) {

+			throw new HTTP_Request2_LogicException(

+				'cURL extension not available', HTTP_Request2_Exception::MISCONFIGURATION

+			);

+		}

+

+		$this->request              = $request;

+		$this->response             = null;

+		$this->position             = 0;

+		$this->eventSentHeaders     = false;

+		$this->eventReceivedHeaders = false;

+

+		try {

+			if (false === curl_exec($ch = $this->createCurlHandle())) {

+				$e = self::wrapCurlError($ch);

+			}

+		} catch (Exception $e) {

+		}

+		if (isset($ch)) {

+			$this->lastInfo = curl_getinfo($ch);

+			curl_close($ch);

+		}

+

+		$response = $this->response;

+		unset($this->request, $this->requestBody, $this->response);

+

+		if (!empty($e)) {

+			throw $e;

+		}

+

+		if ($jar = $request->getCookieJar()) {

+			$jar->addCookiesFromResponse($response, $request->getUrl());

+		}

+

+		if (0 < $this->lastInfo['size_download']) {

+			$request->setLastEvent('receivedBody', $response);

+		}

+		return $response;

+	}

+

+	/**

+	 * Returns information about last transfer

+	 *

+	 * @return   array   associative array as returned by curl_getinfo()

+	 */

+	public function getInfo()

+	{

+		return $this->lastInfo;

+	}

+

+	/**

+	 * Creates a new cURL handle and populates it with data from the request

+	 *

+	 * @return   resource    a cURL handle, as created by curl_init()

+	 * @throws   HTTP_Request2_LogicException

+	 * @throws   HTTP_Request2_NotImplementedException

+	 */

+	protected function createCurlHandle()

+	{

+		$ch = curl_init();

+

+		curl_setopt_array($ch, array(

+			// setup write callbacks

+			CURLOPT_HEADERFUNCTION => array($this, 'callbackWriteHeader'),

+			CURLOPT_WRITEFUNCTION  => array($this, 'callbackWriteBody'),

+			// buffer size

+			CURLOPT_BUFFERSIZE     => $this->request->getConfig('buffer_size'),

+			// connection timeout

+			CURLOPT_CONNECTTIMEOUT => $this->request->getConfig('connect_timeout'),

+			// save full outgoing headers, in case someone is interested

+			CURLINFO_HEADER_OUT    => true,

+			// request url

+			CURLOPT_URL            => $this->request->getUrl()->getUrl()

+		));

+

+		// set up redirects

+		if (!$this->request->getConfig('follow_redirects')) {

+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);

+		} else {

+			if (!@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true)) {

+				throw new HTTP_Request2_LogicException(

+					'Redirect support in curl is unavailable due to open_basedir or safe_mode setting',

+					HTTP_Request2_Exception::MISCONFIGURATION

+				);

+			}

+			curl_setopt($ch, CURLOPT_MAXREDIRS, $this->request->getConfig('max_redirects'));

+			// limit redirects to http(s), works in 5.2.10+

+			if (defined('CURLOPT_REDIR_PROTOCOLS')) {

+				curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);

+			}

+			// works in 5.3.2+, http://bugs.php.net/bug.php?id=49571

+			if ($this->request->getConfig('strict_redirects') && defined('CURLOPT_POSTREDIR')) {

+				curl_setopt($ch, CURLOPT_POSTREDIR, 3);

+			}

+		}

+

+		// set local IP via CURLOPT_INTERFACE (request #19515)

+		if ($ip = $this->request->getConfig('local_ip')) {

+			curl_setopt($ch, CURLOPT_INTERFACE, $ip);

+		}

+

+		// request timeout

+		if ($timeout = $this->request->getConfig('timeout')) {

+			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);

+		}

+

+		// set HTTP version

+		switch ($this->request->getConfig('protocol_version')) {

+		case '1.0':

+			curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);

+			break;

+		case '1.1':

+			curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);

+		}

+

+		// set request method

+		switch ($this->request->getMethod()) {

+		case HTTP_Request2::METHOD_GET:

+			curl_setopt($ch, CURLOPT_HTTPGET, true);

+			break;

+		case HTTP_Request2::METHOD_POST:

+			curl_setopt($ch, CURLOPT_POST, true);

+			break;

+		case HTTP_Request2::METHOD_HEAD:

+			curl_setopt($ch, CURLOPT_NOBODY, true);

+			break;

+		case HTTP_Request2::METHOD_PUT:

+			curl_setopt($ch, CURLOPT_UPLOAD, true);

+			break;

+		default:

+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());

+		}

+

+		// set proxy, if needed

+		if ($host = $this->request->getConfig('proxy_host')) {

+			if (!($port = $this->request->getConfig('proxy_port'))) {

+				throw new HTTP_Request2_LogicException(

+					'Proxy port not provided', HTTP_Request2_Exception::MISSING_VALUE

+				);

+			}

+			curl_setopt($ch, CURLOPT_PROXY, $host . ':' . $port);

+			if ($user = $this->request->getConfig('proxy_user')) {

+				curl_setopt(

+					$ch, CURLOPT_PROXYUSERPWD,

+					$user . ':' . $this->request->getConfig('proxy_password')

+				);

+				switch ($this->request->getConfig('proxy_auth_scheme')) {

+				case HTTP_Request2::AUTH_BASIC:

+					curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);

+					break;

+				case HTTP_Request2::AUTH_DIGEST:

+					curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);

+				}

+			}

+			if ($type = $this->request->getConfig('proxy_type')) {

+				switch ($type) {

+				case 'http':

+					curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);

+					break;

+				case 'socks5':

+					curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);

+					break;

+				default:

+					throw new HTTP_Request2_NotImplementedException(

+						"Proxy type '{$type}' is not supported"

+					);

+				}

+			}

+		}

+

+		// set authentication data

+		if ($auth = $this->request->getAuth()) {

+			curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);

+			switch ($auth['scheme']) {

+			case HTTP_Request2::AUTH_BASIC:

+				curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);

+				break;

+			case HTTP_Request2::AUTH_DIGEST:

+				curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);

+			}

+		}

+

+		// set SSL options

+		foreach ($this->request->getConfig() as $name => $value) {

+			if ('ssl_verify_host' == $name && null !== $value) {

+				curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);

+			} elseif (isset(self::$sslContextMap[$name]) && null !== $value) {

+				curl_setopt($ch, self::$sslContextMap[$name], $value);

+			}

+		}

+

+		$headers = $this->request->getHeaders();

+		// make cURL automagically send proper header

+		if (!isset($headers['accept-encoding'])) {

+			$headers['accept-encoding'] = '';

+		}

+

+		if (($jar = $this->request->getCookieJar())

+			&& ($cookies = $jar->getMatching($this->request->getUrl(), true))

+		) {

+			$headers['cookie'] = (empty($headers['cookie'])? '': $headers['cookie'] . '; ') . $cookies;

+		}

+

+		// set headers having special cURL keys

+		foreach (self::$headerMap as $name => $option) {

+			if (isset($headers[$name])) {

+				curl_setopt($ch, $option, $headers[$name]);

+				unset($headers[$name]);

+			}

+		}

+

+		$this->calculateRequestLength($headers);

+		if (isset($headers['content-length']) || isset($headers['transfer-encoding'])) {

+			$this->workaroundPhpBug47204($ch, $headers);

+		}

+

+		// set headers not having special keys

+		$headersFmt = array();

+		foreach ($headers as $name => $value) {

+			$canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));

+			$headersFmt[]  = $canonicalName . ': ' . $value;

+		}

+		curl_setopt($ch, CURLOPT_HTTPHEADER, $headersFmt);

+

+		return $ch;

+	}

+

+	/**

+	 * Workaround for PHP bug #47204 that prevents rewinding request body

+	 *

+	 * The workaround consists of reading the entire request body into memory

+	 * and setting it as CURLOPT_POSTFIELDS, so it isn't recommended for large

+	 * file uploads, use Socket adapter instead.

+	 *

+	 * @param resource $ch       cURL handle

+	 * @param array    &$headers Request headers

+	 */

+	protected function workaroundPhpBug47204($ch, &$headers)

+	{

+		// no redirects, no digest auth -> probably no rewind needed

+		if (!$this->request->getConfig('follow_redirects')

+			&& (!($auth = $this->request->getAuth())

+				|| HTTP_Request2::AUTH_DIGEST != $auth['scheme'])

+		) {

+			curl_setopt($ch, CURLOPT_READFUNCTION, array($this, 'callbackReadBody'));

+

+		} else {

+			// rewind may be needed, read the whole body into memory

+			if ($this->requestBody instanceof HTTP_Request2_MultipartBody) {

+				$this->requestBody = $this->requestBody->__toString();

+

+			} elseif (is_resource($this->requestBody)) {

+				$fp = $this->requestBody;

+				$this->requestBody = '';

+				while (!feof($fp)) {

+					$this->requestBody .= fread($fp, 16384);

+				}

+			}

+			// curl hangs up if content-length is present

+			unset($headers['content-length']);

+			curl_setopt($ch, CURLOPT_POSTFIELDS, $this->requestBody);

+		}

+	}

+

+	/**

+	 * Callback function called by cURL for reading the request body

+	 *

+	 * @param resource $ch     cURL handle

+	 * @param resource $fd     file descriptor (not used)

+	 * @param integer  $length maximum length of data to return

+	 *

+	 * @return   string      part of the request body, up to $length bytes

+	 */

+	protected function callbackReadBody($ch, $fd, $length)

+	{

+		if (!$this->eventSentHeaders) {

+			$this->request->setLastEvent(

+				'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)

+			);

+			$this->eventSentHeaders = true;

+		}

+		if (in_array($this->request->getMethod(), self::$bodyDisallowed)

+			|| 0 == $this->contentLength || $this->position >= $this->contentLength

+		) {

+			return '';

+		}

+		if (is_string($this->requestBody)) {

+			$string = substr($this->requestBody, $this->position, $length);

+		} elseif (is_resource($this->requestBody)) {

+			$string = fread($this->requestBody, $length);

+		} else {

+			$string = $this->requestBody->read($length);

+		}

+		$this->request->setLastEvent('sentBodyPart', strlen($string));

+		$this->position += strlen($string);

+		return $string;

+	}

+

+	/**

+	 * Callback function called by cURL for saving the response headers

+	 *

+	 * @param resource $ch     cURL handle

+	 * @param string   $string response header (with trailing CRLF)

+	 *

+	 * @return   integer     number of bytes saved

+	 * @see      HTTP_Request2_Response::parseHeaderLine()

+	 */

+	protected function callbackWriteHeader($ch, $string)

+	{

+		// we may receive a second set of headers if doing e.g. digest auth

+		if ($this->eventReceivedHeaders || !$this->eventSentHeaders) {

+			// don't bother with 100-Continue responses (bug #15785)

+			if (!$this->eventSentHeaders

+				|| $this->response->getStatus() >= 200

+			) {

+				$this->request->setLastEvent(

+					'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)

+				);

+			}

+			$upload = curl_getinfo($ch, CURLINFO_SIZE_UPLOAD);

+			// if body wasn't read by a callback, send event with total body size

+			if ($upload > $this->position) {

+				$this->request->setLastEvent(

+					'sentBodyPart', $upload - $this->position

+				);

+				$this->position = $upload;

+			}

+			if ($upload && (!$this->eventSentHeaders

+							|| $this->response->getStatus() >= 200)

+			) {

+				$this->request->setLastEvent('sentBody', $upload);

+			}

+			$this->eventSentHeaders = true;

+			// we'll need a new response object

+			if ($this->eventReceivedHeaders) {

+				$this->eventReceivedHeaders = false;

+				$this->response             = null;

+			}

+		}

+		if (empty($this->response)) {

+			$this->response = new HTTP_Request2_Response(

+				$string, false, curl_getinfo($ch, CURLINFO_EFFECTIVE_URL)

+			);

+		} else {

+			$this->response->parseHeaderLine($string);

+			if ('' == trim($string)) {

+				// don't bother with 100-Continue responses (bug #15785)

+				if (200 <= $this->response->getStatus()) {

+					$this->request->setLastEvent('receivedHeaders', $this->response);

+				}

+

+				if ($this->request->getConfig('follow_redirects') && $this->response->isRedirect()) {

+					$redirectUrl = new Net_URL2($this->response->getHeader('location'));

+

+					// for versions lower than 5.2.10, check the redirection URL protocol

+					if (!defined('CURLOPT_REDIR_PROTOCOLS') && $redirectUrl->isAbsolute()

+						&& !in_array($redirectUrl->getScheme(), array('http', 'https'))

+					) {

+						return -1;

+					}

+

+					if ($jar = $this->request->getCookieJar()) {

+						$jar->addCookiesFromResponse($this->response, $this->request->getUrl());

+						if (!$redirectUrl->isAbsolute()) {

+							$redirectUrl = $this->request->getUrl()->resolve($redirectUrl);

+						}

+						if ($cookies = $jar->getMatching($redirectUrl, true)) {

+							curl_setopt($ch, CURLOPT_COOKIE, $cookies);

+						}

+					}

+				}

+				$this->eventReceivedHeaders = true;

+			}

+		}

+		return strlen($string);

+	}

+

+	/**

+	 * Callback function called by cURL for saving the response body

+	 *

+	 * @param resource $ch     cURL handle (not used)

+	 * @param string   $string part of the response body

+	 *

+	 * @return   integer     number of bytes saved

+	 * @throws   HTTP_Request2_MessageException

+	 * @see      HTTP_Request2_Response::appendBody()

+	 */

+	protected function callbackWriteBody($ch, $string)

+	{

+		// cURL calls WRITEFUNCTION callback without calling HEADERFUNCTION if

+		// response doesn't start with proper HTTP status line (see bug #15716)

+		if (empty($this->response)) {

+			throw new HTTP_Request2_MessageException(

+				"Malformed response: {$string}",

+				HTTP_Request2_Exception::MALFORMED_RESPONSE

+			);

+		}

+		if ($this->request->getConfig('store_body')) {

+			$this->response->appendBody($string);

+		}

+		$this->request->setLastEvent('receivedBodyPart', $string);

+		return strlen($string);

+	}

 }

 ?>

Switch Indentation +39 added lines, -39 removed lines

@@ -268,29 +268,29 @@ 
 

         // set HTTP version

         switch ($this->request->getConfig('protocol_version')) {

-        case '1.0':

-            curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);

-            break;

-        case '1.1':

-            curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);

+        	case '1.0':

+            	curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);

+            	break;

+        	case '1.1':

+            	curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);

         }

 

         // set request method

         switch ($this->request->getMethod()) {

-        case HTTP_Request2::METHOD_GET:

-            curl_setopt($ch, CURLOPT_HTTPGET, true);

-            break;

-        case HTTP_Request2::METHOD_POST:

-            curl_setopt($ch, CURLOPT_POST, true);

-            break;

-        case HTTP_Request2::METHOD_HEAD:

-            curl_setopt($ch, CURLOPT_NOBODY, true);

-            break;

-        case HTTP_Request2::METHOD_PUT:

-            curl_setopt($ch, CURLOPT_UPLOAD, true);

-            break;

-        default:

-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());

+        	case HTTP_Request2::METHOD_GET:

+            	curl_setopt($ch, CURLOPT_HTTPGET, true);

+            	break;

+        	case HTTP_Request2::METHOD_POST:

+            	curl_setopt($ch, CURLOPT_POST, true);

+            	break;

+        	case HTTP_Request2::METHOD_HEAD:

+            	curl_setopt($ch, CURLOPT_NOBODY, true);

+            	break;

+        	case HTTP_Request2::METHOD_PUT:

+            	curl_setopt($ch, CURLOPT_UPLOAD, true);

+            	break;

+        	default:

+            	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());

         }

 

         // set proxy, if needed

@@ -307,25 +307,25 @@ 
                     $user . ':' . $this->request->getConfig('proxy_password')

                 );

                 switch ($this->request->getConfig('proxy_auth_scheme')) {

-                case HTTP_Request2::AUTH_BASIC:

-                    curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);

-                    break;

-                case HTTP_Request2::AUTH_DIGEST:

-                    curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);

+                	case HTTP_Request2::AUTH_BASIC:

+                    	curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);

+                    	break;

+                	case HTTP_Request2::AUTH_DIGEST:

+                    	curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);

                 }

             }

             if ($type = $this->request->getConfig('proxy_type')) {

                 switch ($type) {

-                case 'http':

-                    curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);

-                    break;

-                case 'socks5':

-                    curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);

-                    break;

-                default:

-                    throw new HTTP_Request2_NotImplementedException(

-                        "Proxy type '{$type}' is not supported"

-                    );

+                	case 'http':

+                    	curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);

+                    	break;

+                	case 'socks5':

+                    	curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);

+                    	break;

+                	default:

+                    	throw new HTTP_Request2_NotImplementedException(

+                        	"Proxy type '{$type}' is not supported"

+                    	);

                 }

             }

         }

@@ -334,11 +334,11 @@ 
         if ($auth = $this->request->getAuth()) {

             curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);

             switch ($auth['scheme']) {

-            case HTTP_Request2::AUTH_BASIC:

-                curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);

-                break;

-            case HTTP_Request2::AUTH_DIGEST:

-                curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);

+            	case HTTP_Request2::AUTH_BASIC:

+                	curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);

+                	break;

+            	case HTTP_Request2::AUTH_DIGEST:

+                	curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);

             }

         }

 

Spacing +2 added lines, -2 removed lines

@@ -345,7 +345,7 @@ 
         // set SSL options

         foreach ($this->request->getConfig() as $name => $value) {

             if ('ssl_verify_host' == $name && null !== $value) {

-                curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);

+                curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value ? 2 : 0);

             } elseif (isset(self::$sslContextMap[$name]) && null !== $value) {

                 curl_setopt($ch, self::$sslContextMap[$name], $value);

             }

@@ -360,7 +360,7 @@ 
         if (($jar = $this->request->getCookieJar())

             && ($cookies = $jar->getMatching($this->request->getUrl(), true))

         ) {

-            $headers['cookie'] = (empty($headers['cookie'])? '': $headers['cookie'] . '; ') . $cookies;

+            $headers['cookie'] = (empty($headers['cookie']) ? '' : $headers['cookie'] . '; ') . $cookies;

         }

 

         // set headers having special cURL keys

libs/PEAR.1.9.5/HTTP/Request2/Adapter/Mock.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
      */

     public function sendRequest(HTTP_Request2 $request)

     {

-        $requestUrl = (string)$request->getUrl();

+        $requestUrl = (string) $request->getUrl();

         $response   = null;

         foreach ($this->responses as $k => $v) {

             if (!$v[1] || $requestUrl == $v[1]) {

Indentation +106 added lines, -106 removed lines

@@ -49,118 +49,118 @@
  */

 class HTTP_Request2_Adapter_Mock extends HTTP_Request2_Adapter

 {

-    /**

-     * A queue of responses to be returned by sendRequest()

-     * @var  array

-     */

-    protected $responses = array();

+	/**

+	 * A queue of responses to be returned by sendRequest()

+	 * @var  array

+	 */

+	protected $responses = array();

 

-    /**

-     * Returns the next response from the queue built by addResponse()

-     *

-     * Only responses without explicit URLs or with URLs equal to request URL

-     * will be considered. If matching response is not found or the queue is

-     * empty then default empty response with status 400 will be returned,

-     * if an Exception object was added to the queue it will be thrown.

-     *

-     * @param HTTP_Request2 $request HTTP request message

-     *

-     * @return   HTTP_Request2_Response

-     * @throws   Exception

-     */

-    public function sendRequest(HTTP_Request2 $request)

-    {

-        $requestUrl = (string)$request->getUrl();

-        $response   = null;

-        foreach ($this->responses as $k => $v) {

-            if (!$v[1] || $requestUrl == $v[1]) {

-                $response = $v[0];

-                array_splice($this->responses, $k, 1);

-                break;

-            }

-        }

-        if (!$response) {

-            return self::createResponseFromString("HTTP/1.1 400 Bad Request\r\n\r\n");

+	/**

+	 * Returns the next response from the queue built by addResponse()

+	 *

+	 * Only responses without explicit URLs or with URLs equal to request URL

+	 * will be considered. If matching response is not found or the queue is

+	 * empty then default empty response with status 400 will be returned,

+	 * if an Exception object was added to the queue it will be thrown.

+	 *

+	 * @param HTTP_Request2 $request HTTP request message

+	 *

+	 * @return   HTTP_Request2_Response

+	 * @throws   Exception

+	 */

+	public function sendRequest(HTTP_Request2 $request)

+	{

+		$requestUrl = (string)$request->getUrl();

+		$response   = null;

+		foreach ($this->responses as $k => $v) {

+			if (!$v[1] || $requestUrl == $v[1]) {

+				$response = $v[0];

+				array_splice($this->responses, $k, 1);

+				break;

+			}

+		}

+		if (!$response) {

+			return self::createResponseFromString("HTTP/1.1 400 Bad Request\r\n\r\n");

 

-        } elseif ($response instanceof HTTP_Request2_Response) {

-            return $response;

+		} elseif ($response instanceof HTTP_Request2_Response) {

+			return $response;

 

-        } else {

-            // rethrow the exception

-            $class   = get_class($response);

-            $message = $response->getMessage();

-            $code    = $response->getCode();

-            throw new $class($message, $code);

-        }

-    }

+		} else {

+			// rethrow the exception

+			$class   = get_class($response);

+			$message = $response->getMessage();

+			$code    = $response->getCode();

+			throw new $class($message, $code);

+		}

+	}

 

-    /**

-     * Adds response to the queue

-     *

-     * @param mixed  $response either a string, a pointer to an open file,

-     *                         an instance of HTTP_Request2_Response or Exception

-     * @param string $url      A request URL this response should be valid for

-     *                         (see {@link http://pear.php.net/bugs/bug.php?id=19276})

-     *

-     * @throws   HTTP_Request2_Exception

-     */

-    public function addResponse($response, $url = null)

-    {

-        if (is_string($response)) {

-            $response = self::createResponseFromString($response);

-        } elseif (is_resource($response)) {

-            $response = self::createResponseFromFile($response);

-        } elseif (!$response instanceof HTTP_Request2_Response &&

-                  !$response instanceof Exception

-        ) {

-            throw new HTTP_Request2_Exception('Parameter is not a valid response');

-        }

-        $this->responses[] = array($response, $url);

-    }

+	/**

+	 * Adds response to the queue

+	 *

+	 * @param mixed  $response either a string, a pointer to an open file,

+	 *                         an instance of HTTP_Request2_Response or Exception

+	 * @param string $url      A request URL this response should be valid for

+	 *                         (see {@link http://pear.php.net/bugs/bug.php?id=19276})

+	 *

+	 * @throws   HTTP_Request2_Exception

+	 */

+	public function addResponse($response, $url = null)

+	{

+		if (is_string($response)) {

+			$response = self::createResponseFromString($response);

+		} elseif (is_resource($response)) {

+			$response = self::createResponseFromFile($response);

+		} elseif (!$response instanceof HTTP_Request2_Response &&

+				  !$response instanceof Exception

+		) {

+			throw new HTTP_Request2_Exception('Parameter is not a valid response');

+		}

+		$this->responses[] = array($response, $url);

+	}

 

-    /**

-     * Creates a new HTTP_Request2_Response object from a string

-     *

-     * @param string $str string containing HTTP response message

-     *

-     * @return   HTTP_Request2_Response

-     * @throws   HTTP_Request2_Exception

-     */

-    public static function createResponseFromString($str)

-    {

-        $parts       = preg_split('!(\r?\n){2}!m', $str, 2);

-        $headerLines = explode("\n", $parts[0]);

-        $response    = new HTTP_Request2_Response(array_shift($headerLines));

-        foreach ($headerLines as $headerLine) {

-            $response->parseHeaderLine($headerLine);

-        }

-        $response->parseHeaderLine('');

-        if (isset($parts[1])) {

-            $response->appendBody($parts[1]);

-        }

-        return $response;

-    }

+	/**

+	 * Creates a new HTTP_Request2_Response object from a string

+	 *

+	 * @param string $str string containing HTTP response message

+	 *

+	 * @return   HTTP_Request2_Response

+	 * @throws   HTTP_Request2_Exception

+	 */

+	public static function createResponseFromString($str)

+	{

+		$parts       = preg_split('!(\r?\n){2}!m', $str, 2);

+		$headerLines = explode("\n", $parts[0]);

+		$response    = new HTTP_Request2_Response(array_shift($headerLines));

+		foreach ($headerLines as $headerLine) {

+			$response->parseHeaderLine($headerLine);

+		}

+		$response->parseHeaderLine('');

+		if (isset($parts[1])) {

+			$response->appendBody($parts[1]);

+		}

+		return $response;

+	}

 

-    /**

-     * Creates a new HTTP_Request2_Response object from a file

-     *

-     * @param resource $fp file pointer returned by fopen()

-     *

-     * @return   HTTP_Request2_Response

-     * @throws   HTTP_Request2_Exception

-     */

-    public static function createResponseFromFile($fp)

-    {

-        $response = new HTTP_Request2_Response(fgets($fp));

-        do {

-            $headerLine = fgets($fp);

-            $response->parseHeaderLine($headerLine);

-        } while ('' != trim($headerLine));

+	/**

+	 * Creates a new HTTP_Request2_Response object from a file

+	 *

+	 * @param resource $fp file pointer returned by fopen()

+	 *

+	 * @return   HTTP_Request2_Response

+	 * @throws   HTTP_Request2_Exception

+	 */

+	public static function createResponseFromFile($fp)

+	{

+		$response = new HTTP_Request2_Response(fgets($fp));

+		do {

+			$headerLine = fgets($fp);

+			$response->parseHeaderLine($headerLine);

+		} while ('' != trim($headerLine));

 

-        while (!feof($fp)) {

-            $response->appendBody(fread($fp, 8192));

-        }

-        return $response;

-    }

+		while (!feof($fp)) {

+			$response->appendBody(fread($fp, 8192));

+		}

+		return $response;

+	}

 }

 ?>
\ No newline at end of file

libs/PEAR.1.9.5/HTTP/Request2/Adapter/Socket.php

Switch Indentation +52 added lines, -52 removed lines

@@ -732,34 +732,34 @@ 
             return;

         }

         switch ($auth['scheme']) {

-        case HTTP_Request2::AUTH_BASIC:

-            $headers['authorization'] = 'Basic ' . base64_encode(

-                $auth['user'] . ':' . $auth['password']

-            );

-            break;

-

-        case HTTP_Request2::AUTH_DIGEST:

-            unset($this->serverChallenge);

-            $fullUrl = ('/' == $requestUrl[0])?

-                       $this->request->getUrl()->getScheme() . '://' .

-                        $requestHost . $requestUrl:

-                       $requestUrl;

-            foreach (array_keys(self::$challenges) as $key) {

-                if ($key == substr($fullUrl, 0, strlen($key))) {

-                    $headers['authorization'] = $this->createDigestResponse(

-                        $auth['user'], $auth['password'],

-                        $requestUrl, self::$challenges[$key]

-                    );

-                    $this->serverChallenge =& self::$challenges[$key];

-                    break;

-                }

-            }

-            break;

-

-        default:

-            throw new HTTP_Request2_NotImplementedException(

-                "Unknown HTTP authentication scheme '{$auth['scheme']}'"

-            );

+        	case HTTP_Request2::AUTH_BASIC:

+            	$headers['authorization'] = 'Basic ' . base64_encode(

+                	$auth['user'] . ':' . $auth['password']

+            	);

+            	break;

+

+        	case HTTP_Request2::AUTH_DIGEST:

+            	unset($this->serverChallenge);

+            	$fullUrl = ('/' == $requestUrl[0])?

+                       	$this->request->getUrl()->getScheme() . '://' .

+                        	$requestHost . $requestUrl:

+                       	$requestUrl;

+            	foreach (array_keys(self::$challenges) as $key) {

+                	if ($key == substr($fullUrl, 0, strlen($key))) {

+                    	$headers['authorization'] = $this->createDigestResponse(

+                        	$auth['user'], $auth['password'],

+                        	$requestUrl, self::$challenges[$key]

+                    	);

+                    	$this->serverChallenge =& self::$challenges[$key];

+                    	break;

+                	}

+            	}

+            	break;

+

+        	default:

+            	throw new HTTP_Request2_NotImplementedException(

+                	"Unknown HTTP authentication scheme '{$auth['scheme']}'"

+            	);

         }

     }

 

@@ -783,30 +783,30 @@ 
 

         $password = $this->request->getConfig('proxy_password');

         switch ($this->request->getConfig('proxy_auth_scheme')) {

-        case HTTP_Request2::AUTH_BASIC:

-            $headers['proxy-authorization'] = 'Basic ' . base64_encode(

-                $user . ':' . $password

-            );

-            break;

-

-        case HTTP_Request2::AUTH_DIGEST:

-            unset($this->proxyChallenge);

-            $proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .

-                        ':' . $this->request->getConfig('proxy_port');

-            if (!empty(self::$challenges[$proxyUrl])) {

-                $headers['proxy-authorization'] = $this->createDigestResponse(

-                    $user, $password,

-                    $requestUrl, self::$challenges[$proxyUrl]

-                );

-                $this->proxyChallenge =& self::$challenges[$proxyUrl];

-            }

-            break;

-

-        default:

-            throw new HTTP_Request2_NotImplementedException(

-                "Unknown HTTP authentication scheme '" .

-                $this->request->getConfig('proxy_auth_scheme') . "'"

-            );

+        	case HTTP_Request2::AUTH_BASIC:

+            	$headers['proxy-authorization'] = 'Basic ' . base64_encode(

+                	$user . ':' . $password

+            	);

+            	break;

+

+        	case HTTP_Request2::AUTH_DIGEST:

+            	unset($this->proxyChallenge);

+            	$proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .

+                        	':' . $this->request->getConfig('proxy_port');

+            	if (!empty(self::$challenges[$proxyUrl])) {

+                	$headers['proxy-authorization'] = $this->createDigestResponse(

+                    	$user, $password,

+                    	$requestUrl, self::$challenges[$proxyUrl]

+                	);

+                	$this->proxyChallenge =& self::$challenges[$proxyUrl];

+            	}

+            	break;

+

+        	default:

+            	throw new HTTP_Request2_NotImplementedException(

+                	"Unknown HTTP authentication scheme '" .

+                	$this->request->getConfig('proxy_auth_scheme') . "'"

+            	);

         }

     }

 

Spacing +23 added lines, -26 removed lines

@@ -199,7 +199,7 @@ 
         $headers = $this->request->getHeaders();

         $reqHost = $this->request->getUrl()->getHost();

         if (!($reqPort = $this->request->getUrl()->getPort())) {

-            $reqPort = $secure? 443: 80;

+            $reqPort = $secure ? 443 : 80;

         }

 

         $httpProxy = $socksProxy = false;

@@ -281,12 +281,12 @@ 
 

         // Changing SSL context options after connection is established does *not*

         // work, we need a new connection if options change

-        $remote    = ((!$secure || $httpProxy || $socksProxy)? 'tcp://': 'ssl://')

+        $remote    = ((!$secure || $httpProxy || $socksProxy) ? 'tcp://' : 'ssl://')

                      . $host . ':' . $port;

         $socketKey = $remote . (

                         ($secure && $httpProxy || $socksProxy)

                         ? "->{$reqHost}:{$reqPort}" : ''

-                     ) . (empty($options)? '': ':' . serialize($options));

+                     ) . (empty($options) ? '' : ':' . serialize($options));

         unset($this->socket);

 

         // We use persistent connections and have a connected socket?

@@ -294,7 +294,7 @@ 
         if ($keepAlive && !empty(self::$sockets[$socketKey])

             && !self::$sockets[$socketKey]->eof()

         ) {

-            $this->socket =& self::$sockets[$socketKey];

+            $this->socket = & self::$sockets[$socketKey];

 

         } else {

             if ($socksProxy) {

@@ -324,8 +324,8 @@ 
                     $remote, $this->request->getConfig('connect_timeout'), $options

                 );

             }

-            $this->request->setLastEvent('connect', empty($conninfo)? $remote: $conninfo);

-            self::$sockets[$socketKey] =& $this->socket;

+            $this->request->setLastEvent('connect', empty($conninfo) ? $remote : $conninfo);

+            self::$sockets[$socketKey] = & $this->socket;

         }

         $this->socket->setDeadline($deadline, $this->request->getConfig('timeout'));

         return $keepAlive;

@@ -383,7 +383,7 @@ 
                        // no body possible for such responses, see also request #17031

                        || HTTP_Request2::METHOD_HEAD == $this->request->getMethod()

                        || in_array($response->getStatus(), array(204, 304));

-        $persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||

+        $persistent = 'keep-alive' == strtolower($response->getHeader('connection')) ||

                        (null === $response->getHeader('connection') &&

                         '1.1' == $response->getVersion());

         return $requestKeepAlive && $lengthKnown && $persistent;

@@ -522,7 +522,7 @@ 
                 // probably credentials are invalid

                 $ret = false;

             }

-            self::$challenges[$prefix] =& $challenge;

+            self::$challenges[$prefix] = & $challenge;

         }

         return $ret;

     }

@@ -709,12 +709,10 @@ 
                'nonce="' . $challenge['nonce'] . '", ' .

                'uri="' . $url . '", ' .

                'response="' . $digest . '"' .

-               (!empty($challenge['opaque'])?

-                ', opaque="' . $challenge['opaque'] . '"':

-                '') .

-               (!empty($challenge['qop'])?

-                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':

-                '');

+               (!empty($challenge['opaque']) ?

+                ', opaque="' . $challenge['opaque'] . '"' : '') .

+               (!empty($challenge['qop']) ?

+                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"' : '');

     }

 

     /**

@@ -740,17 +738,16 @@ 
 

         case HTTP_Request2::AUTH_DIGEST:

             unset($this->serverChallenge);

-            $fullUrl = ('/' == $requestUrl[0])?

+            $fullUrl = ('/' == $requestUrl[0]) ?

                        $this->request->getUrl()->getScheme() . '://' .

-                        $requestHost . $requestUrl:

-                       $requestUrl;

+                        $requestHost . $requestUrl : $requestUrl;

             foreach (array_keys(self::$challenges) as $key) {

                 if ($key == substr($fullUrl, 0, strlen($key))) {

                     $headers['authorization'] = $this->createDigestResponse(

                         $auth['user'], $auth['password'],

                         $requestUrl, self::$challenges[$key]

                     );

-                    $this->serverChallenge =& self::$challenges[$key];

+                    $this->serverChallenge = & self::$challenges[$key];

                     break;

                 }

             }

@@ -798,7 +795,7 @@ 
                     $user, $password,

                     $requestUrl, self::$challenges[$proxyUrl]

                 );

-                $this->proxyChallenge =& self::$challenges[$proxyUrl];

+                $this->proxyChallenge = & self::$challenges[$proxyUrl];

             }

             break;

 

@@ -824,9 +821,9 @@ 
         $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();

         $host    = $url->getHost();

 

-        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;

+        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https') ? 443 : 80;

         if (($port = $url->getPort()) && $port != $defaultPort || $connect) {

-            $host .= ':' . (empty($port)? $defaultPort: $port);

+            $host .= ':' . (empty($port) ? $defaultPort : $port);

         }

         // Do not overwrite explicitly set 'Host' header, see bug #16146

         if (!isset($headers['host'])) {

@@ -847,7 +844,7 @@ 
             }

             $path        = $url->getPath();

             $query       = $url->getQuery();

-            $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);

+            $requestUrl .= (empty($path) ? '/' : $path) . (empty($query) ? '' : '?' . $query);

         }

 

         if ('1.1' == $this->request->getConfig('protocol_version')

@@ -858,7 +855,7 @@ 
         if (($jar = $this->request->getCookieJar())

             && ($cookies = $jar->getMatching($this->request->getUrl(), true))

         ) {

-            $headers['cookie'] = (empty($headers['cookie'])? '': $headers['cookie'] . '; ') . $cookies;

+            $headers['cookie'] = (empty($headers['cookie']) ? '' : $headers['cookie'] . '; ') . $cookies;

         }

 

         $this->addAuthorizationHeader($headers, $host, $requestUrl);

@@ -913,7 +910,7 @@ 
                                . self::REGEXP_TOKEN . '|'

                                . self::REGEXP_QUOTED_STRING . ')\s*(?:'

                                . $expectParam . ')*)?';

-            $expectItem      = '!(100-continue|' . $expectExtension . ')!A';

+            $expectItem = '!(100-continue|' . $expectExtension . ')!A';

 

             $pos    = 0;

             $length = strlen($headers['expect']);

@@ -933,7 +930,7 @@ 
                 } else {

                     $pos += strlen($m[0]);

                     if (strcasecmp('100-continue', $m[0])) {

-                        $expectations[]  = $m[0];

+                        $expectations[] = $m[0];

                     }

                 }

             }

@@ -1048,7 +1045,7 @@ 
             // 3. ... If a message is received with both a

             // Transfer-Encoding header field and a Content-Length header field,

             // the latter MUST be ignored.

-            $toRead = ($chunked || null === $length)? null: $length;

+            $toRead = ($chunked || null === $length) ? null : $length;

             $this->chunkLength = 0;

 

             while (!$this->socket->eof() && (is_null($toRead) || 0 < $toRead)) {

Indentation +1077 added lines, -1077 removed lines

@@ -39,1083 +39,1083 @@
  */

 class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter

 {

-    /**

-     * Regular expression for 'token' rule from RFC 2616

-     */

-    const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';

-

-    /**

-     * Regular expression for 'quoted-string' rule from RFC 2616

-     */

-    const REGEXP_QUOTED_STRING = '"(?>[^"\\\\]+|\\\\.)*"';

-

-    /**

-     * Connected sockets, needed for Keep-Alive support

-     * @var  array

-     * @see  connect()

-     */

-    protected static $sockets = array();

-

-    /**

-     * Data for digest authentication scheme

-     *

-     * The keys for the array are URL prefixes.

-     *

-     * The values are associative arrays with data (realm, nonce, nonce-count,

-     * opaque...) needed for digest authentication. Stored here to prevent making

-     * duplicate requests to digest-protected resources after we have already

-     * received the challenge.

-     *

-     * @var  array

-     */

-    protected static $challenges = array();

-

-    /**

-     * Connected socket

-     * @var  HTTP_Request2_SocketWrapper

-     * @see  connect()

-     */

-    protected $socket;

-

-    /**

-     * Challenge used for server digest authentication

-     * @var  array

-     */

-    protected $serverChallenge;

-

-    /**

-     * Challenge used for proxy digest authentication

-     * @var  array

-     */

-    protected $proxyChallenge;

-

-    /**

-     * Remaining length of the current chunk, when reading chunked response

-     * @var  integer

-     * @see  readChunked()

-     */

-    protected $chunkLength = 0;

-

-    /**

-     * Remaining amount of redirections to follow

-     *

-     * Starts at 'max_redirects' configuration parameter and is reduced on each

-     * subsequent redirect. An Exception will be thrown once it reaches zero.

-     *

-     * @var  integer

-     */

-    protected $redirectCountdown = null;

-

-    /**

-     * Whether to wait for "100 Continue" response before sending request body

-     * @var bool

-     */

-    protected $expect100Continue = false;

-

-    /**

-     * Sends request to the remote server and returns its response

-     *

-     * @param HTTP_Request2 $request HTTP request message

-     *

-     * @return   HTTP_Request2_Response

-     * @throws   HTTP_Request2_Exception

-     */

-    public function sendRequest(HTTP_Request2 $request)

-    {

-        $this->request = $request;

-

-        try {

-            $keepAlive = $this->connect();

-            $headers   = $this->prepareHeaders();

-            $this->socket->write($headers);

-            // provide request headers to the observer, see request #7633

-            $this->request->setLastEvent('sentHeaders', $headers);

-

-            if (!$this->expect100Continue) {

-                $this->writeBody();

-                $response = $this->readResponse();

-

-            } else {

-                $response = $this->readResponse();

-                if (!$response || 100 == $response->getStatus()) {

-                    $this->expect100Continue = false;

-                    // either got "100 Continue" or timed out -> send body

-                    $this->writeBody();

-                    $response = $this->readResponse();

-                }

-            }

-

-

-            if ($jar = $request->getCookieJar()) {

-                $jar->addCookiesFromResponse($response, $request->getUrl());

-            }

-

-            if (!$this->canKeepAlive($keepAlive, $response)) {

-                $this->disconnect();

-            }

-

-            if ($this->shouldUseProxyDigestAuth($response)) {

-                return $this->sendRequest($request);

-            }

-            if ($this->shouldUseServerDigestAuth($response)) {

-                return $this->sendRequest($request);

-            }

-            if ($authInfo = $response->getHeader('authentication-info')) {

-                $this->updateChallenge($this->serverChallenge, $authInfo);

-            }

-            if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {

-                $this->updateChallenge($this->proxyChallenge, $proxyInfo);

-            }

-

-        } catch (Exception $e) {

-            $this->disconnect();

-        }

-

-        unset($this->request, $this->requestBody);

-

-        if (!empty($e)) {

-            $this->redirectCountdown = null;

-            throw $e;

-        }

-

-        if (!$request->getConfig('follow_redirects') || !$response->isRedirect()) {

-            $this->redirectCountdown = null;

-            return $response;

-        } else {

-            return $this->handleRedirect($request, $response);

-        }

-    }

-

-    /**

-     * Connects to the remote server

-     *

-     * @return   bool    whether the connection can be persistent

-     * @throws   HTTP_Request2_Exception

-     */

-    protected function connect()

-    {

-        $secure  = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');

-        $tunnel  = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();

-        $headers = $this->request->getHeaders();

-        $reqHost = $this->request->getUrl()->getHost();

-        if (!($reqPort = $this->request->getUrl()->getPort())) {

-            $reqPort = $secure? 443: 80;

-        }

-

-        $httpProxy = $socksProxy = false;

-        if (!($host = $this->request->getConfig('proxy_host'))) {

-            $host = $reqHost;

-            $port = $reqPort;

-        } else {

-            if (!($port = $this->request->getConfig('proxy_port'))) {

-                throw new HTTP_Request2_LogicException(

-                    'Proxy port not provided',

-                    HTTP_Request2_Exception::MISSING_VALUE

-                );

-            }

-            if ('http' == ($type = $this->request->getConfig('proxy_type'))) {

-                $httpProxy = true;

-            } elseif ('socks5' == $type) {

-                $socksProxy = true;

-            } else {

-                throw new HTTP_Request2_NotImplementedException(

-                    "Proxy type '{$type}' is not supported"

-                );

-            }

-        }

-

-        if ($tunnel && !$httpProxy) {

-            throw new HTTP_Request2_LogicException(

-                "Trying to perform CONNECT request without proxy",

-                HTTP_Request2_Exception::MISSING_VALUE

-            );

-        }

-        if ($secure && !in_array('ssl', stream_get_transports())) {

-            throw new HTTP_Request2_LogicException(

-                'Need OpenSSL support for https:// requests',

-                HTTP_Request2_Exception::MISCONFIGURATION

-            );

-        }

-

-        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive

-        // connection token to a proxy server...

-        if ($httpProxy && !$secure && !empty($headers['connection'])

-            && 'Keep-Alive' == $headers['connection']

-        ) {

-            $this->request->setHeader('connection');

-        }

-

-        $keepAlive = ('1.1' == $this->request->getConfig('protocol_version') &&

-                      empty($headers['connection'])) ||

-                     (!empty($headers['connection']) &&

-                      'Keep-Alive' == $headers['connection']);

-

-        $options = array();

-        if ($ip = $this->request->getConfig('local_ip')) {

-            $options['socket'] = array(

-                'bindto' => (false === strpos($ip, ':') ? $ip : '[' . $ip . ']') . ':0'

-            );

-        }

-        if ($secure || $tunnel) {

-            $options['ssl'] = array();

-            foreach ($this->request->getConfig() as $name => $value) {

-                if ('ssl_' == substr($name, 0, 4) && null !== $value) {

-                    if ('ssl_verify_host' == $name) {

-                        if ($value) {

-                            $options['ssl']['CN_match'] = $reqHost;

-                        }

-                    } else {

-                        $options['ssl'][substr($name, 4)] = $value;

-                    }

-                }

-            }

-            ksort($options['ssl']);

-        }

-

-        // Use global request timeout if given, see feature requests #5735, #8964

-        if ($timeout = $this->request->getConfig('timeout')) {

-            $deadline = time() + $timeout;

-        } else {

-            $deadline = null;

-        }

-

-        // Changing SSL context options after connection is established does *not*

-        // work, we need a new connection if options change

-        $remote    = ((!$secure || $httpProxy || $socksProxy)? 'tcp://': 'ssl://')

-                     . $host . ':' . $port;

-        $socketKey = $remote . (

-                        ($secure && $httpProxy || $socksProxy)

-                        ? "->{$reqHost}:{$reqPort}" : ''

-                     ) . (empty($options)? '': ':' . serialize($options));

-        unset($this->socket);

-

-        // We use persistent connections and have a connected socket?

-        // Ensure that the socket is still connected, see bug #16149

-        if ($keepAlive && !empty(self::$sockets[$socketKey])

-            && !self::$sockets[$socketKey]->eof()

-        ) {

-            $this->socket =& self::$sockets[$socketKey];

-

-        } else {

-            if ($socksProxy) {

-                require_once 'HTTP/Request2/SOCKS5.php';

-

-                $this->socket = new HTTP_Request2_SOCKS5(

-                    $remote, $this->request->getConfig('connect_timeout'),

-                    $options, $this->request->getConfig('proxy_user'),

-                    $this->request->getConfig('proxy_password')

-                );

-                // handle request timeouts ASAP

-                $this->socket->setDeadline($deadline, $this->request->getConfig('timeout'));

-                $this->socket->connect($reqHost, $reqPort);

-                if (!$secure) {

-                    $conninfo = "tcp://{$reqHost}:{$reqPort} via {$remote}";

-                } else {

-                    $this->socket->enableCrypto();

-                    $conninfo = "ssl://{$reqHost}:{$reqPort} via {$remote}";

-                }

-

-            } elseif ($secure && $httpProxy && !$tunnel) {

-                $this->establishTunnel();

-                $conninfo = "ssl://{$reqHost}:{$reqPort} via {$remote}";

-

-            } else {

-                $this->socket = new HTTP_Request2_SocketWrapper(

-                    $remote, $this->request->getConfig('connect_timeout'), $options

-                );

-            }

-            $this->request->setLastEvent('connect', empty($conninfo)? $remote: $conninfo);

-            self::$sockets[$socketKey] =& $this->socket;

-        }

-        $this->socket->setDeadline($deadline, $this->request->getConfig('timeout'));

-        return $keepAlive;

-    }

-

-    /**

-     * Establishes a tunnel to a secure remote server via HTTP CONNECT request

-     *

-     * This method will fail if 'ssl_verify_peer' is enabled. Probably because PHP

-     * sees that we are connected to a proxy server (duh!) rather than the server

-     * that presents its certificate.

-     *

-     * @link     http://tools.ietf.org/html/rfc2817#section-5.2

-     * @throws   HTTP_Request2_Exception

-     */

-    protected function establishTunnel()

-    {

-        $donor   = new self;

-        $connect = new HTTP_Request2(

-            $this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,

-            array_merge($this->request->getConfig(), array('adapter' => $donor))

-        );

-        $response = $connect->send();

-        // Need any successful (2XX) response

-        if (200 > $response->getStatus() || 300 <= $response->getStatus()) {

-            throw new HTTP_Request2_ConnectionException(

-                'Failed to connect via HTTPS proxy. Proxy response: ' .

-                $response->getStatus() . ' ' . $response->getReasonPhrase()

-            );

-        }

-        $this->socket = $donor->socket;

-        $this->socket->enableCrypto();

-    }

-

-    /**

-     * Checks whether current connection may be reused or should be closed

-     *

-     * @param boolean                $requestKeepAlive whether connection could

-     *                               be persistent in the first place

-     * @param HTTP_Request2_Response $response         response object to check

-     *

-     * @return   boolean

-     */

-    protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)

-    {

-        // Do not close socket on successful CONNECT request

-        if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod()

-            && 200 <= $response->getStatus() && 300 > $response->getStatus()

-        ) {

-            return true;

-        }

-

-        $lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding'))

-                       || null !== $response->getHeader('content-length')

-                       // no body possible for such responses, see also request #17031

-                       || HTTP_Request2::METHOD_HEAD == $this->request->getMethod()

-                       || in_array($response->getStatus(), array(204, 304));

-        $persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||

-                       (null === $response->getHeader('connection') &&

-                        '1.1' == $response->getVersion());

-        return $requestKeepAlive && $lengthKnown && $persistent;

-    }

-

-    /**

-     * Disconnects from the remote server

-     */

-    protected function disconnect()

-    {

-        if (!empty($this->socket)) {

-            $this->socket = null;

-            $this->request->setLastEvent('disconnect');

-        }

-    }

-

-    /**

-     * Handles HTTP redirection

-     *

-     * This method will throw an Exception if redirect to a non-HTTP(S) location

-     * is attempted, also if number of redirects performed already is equal to

-     * 'max_redirects' configuration parameter.

-     *

-     * @param HTTP_Request2          $request  Original request

-     * @param HTTP_Request2_Response $response Response containing redirect

-     *

-     * @return   HTTP_Request2_Response      Response from a new location

-     * @throws   HTTP_Request2_Exception

-     */

-    protected function handleRedirect(

-        HTTP_Request2 $request, HTTP_Request2_Response $response

-    ) {

-        if (is_null($this->redirectCountdown)) {

-            $this->redirectCountdown = $request->getConfig('max_redirects');

-        }

-        if (0 == $this->redirectCountdown) {

-            $this->redirectCountdown = null;

-            // Copying cURL behaviour

-            throw new HTTP_Request2_MessageException(

-                'Maximum (' . $request->getConfig('max_redirects') . ') redirects followed',

-                HTTP_Request2_Exception::TOO_MANY_REDIRECTS

-            );

-        }

-        $redirectUrl = new Net_URL2(

-            $response->getHeader('location'),

-            array(Net_URL2::OPTION_USE_BRACKETS => $request->getConfig('use_brackets'))

-        );

-        // refuse non-HTTP redirect

-        if ($redirectUrl->isAbsolute()

-            && !in_array($redirectUrl->getScheme(), array('http', 'https'))

-        ) {

-            $this->redirectCountdown = null;

-            throw new HTTP_Request2_MessageException(

-                'Refusing to redirect to a non-HTTP URL ' . $redirectUrl->__toString(),

-                HTTP_Request2_Exception::NON_HTTP_REDIRECT

-            );

-        }

-        // Theoretically URL should be absolute (see http://tools.ietf.org/html/rfc2616#section-14.30),

-        // but in practice it is often not

-        if (!$redirectUrl->isAbsolute()) {

-            $redirectUrl = $request->getUrl()->resolve($redirectUrl);

-        }

-        $redirect = clone $request;

-        $redirect->setUrl($redirectUrl);

-        if (303 == $response->getStatus()

-            || (!$request->getConfig('strict_redirects')

-                && in_array($response->getStatus(), array(301, 302)))

-        ) {

-            $redirect->setMethod(HTTP_Request2::METHOD_GET);

-            $redirect->setBody('');

-        }

-

-        if (0 < $this->redirectCountdown) {

-            $this->redirectCountdown--;

-        }

-        return $this->sendRequest($redirect);

-    }

-

-    /**

-     * Checks whether another request should be performed with server digest auth

-     *

-     * Several conditions should be satisfied for it to return true:

-     *   - response status should be 401

-     *   - auth credentials should be set in the request object

-     *   - response should contain WWW-Authenticate header with digest challenge

-     *   - there is either no challenge stored for this URL or new challenge

-     *     contains stale=true parameter (in other case we probably just failed

-     *     due to invalid username / password)

-     *

-     * The method stores challenge values in $challenges static property

-     *

-     * @param HTTP_Request2_Response $response response to check

-     *

-     * @return   boolean whether another request should be performed

-     * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters

-     */

-    protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)

-    {

-        // no sense repeating a request if we don't have credentials

-        if (401 != $response->getStatus() || !$this->request->getAuth()) {

-            return false;

-        }

-        if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {

-            return false;

-        }

-

-        $url    = $this->request->getUrl();

-        $scheme = $url->getScheme();

-        $host   = $scheme . '://' . $url->getHost();

-        if ($port = $url->getPort()) {

-            if ((0 == strcasecmp($scheme, 'http') && 80 != $port)

-                || (0 == strcasecmp($scheme, 'https') && 443 != $port)

-            ) {

-                $host .= ':' . $port;

-            }

-        }

-

-        if (!empty($challenge['domain'])) {

-            $prefixes = array();

-            foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {

-                // don't bother with different servers

-                if ('/' == substr($prefix, 0, 1)) {

-                    $prefixes[] = $host . $prefix;

-                }

-            }

-        }

-        if (empty($prefixes)) {

-            $prefixes = array($host . '/');

-        }

-

-        $ret = true;

-        foreach ($prefixes as $prefix) {

-            if (!empty(self::$challenges[$prefix])

-                && (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))

-            ) {

-                // probably credentials are invalid

-                $ret = false;

-            }

-            self::$challenges[$prefix] =& $challenge;

-        }

-        return $ret;

-    }

-

-    /**

-     * Checks whether another request should be performed with proxy digest auth

-     *

-     * Several conditions should be satisfied for it to return true:

-     *   - response status should be 407

-     *   - proxy auth credentials should be set in the request object

-     *   - response should contain Proxy-Authenticate header with digest challenge

-     *   - there is either no challenge stored for this proxy or new challenge

-     *     contains stale=true parameter (in other case we probably just failed

-     *     due to invalid username / password)

-     *

-     * The method stores challenge values in $challenges static property

-     *

-     * @param HTTP_Request2_Response $response response to check

-     *

-     * @return   boolean whether another request should be performed

-     * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters

-     */

-    protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)

-    {

-        if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {

-            return false;

-        }

-        if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {

-            return false;

-        }

-

-        $key = 'proxy://' . $this->request->getConfig('proxy_host') .

-               ':' . $this->request->getConfig('proxy_port');

-

-        if (!empty(self::$challenges[$key])

-            && (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))

-        ) {

-            $ret = false;

-        } else {

-            $ret = true;

-        }

-        self::$challenges[$key] = $challenge;

-        return $ret;

-    }

-

-    /**

-     * Extracts digest method challenge from (WWW|Proxy)-Authenticate header value

-     *

-     * There is a problem with implementation of RFC 2617: several of the parameters

-     * are defined as quoted-string there and thus may contain backslash escaped

-     * double quotes (RFC 2616, section 2.2). However, RFC 2617 defines unq(X) as

-     * just value of quoted-string X without surrounding quotes, it doesn't speak

-     * about removing backslash escaping.

-     *

-     * Now realm parameter is user-defined and human-readable, strange things

-     * happen when it contains quotes:

-     *   - Apache allows quotes in realm, but apparently uses realm value without

-     *     backslashes for digest computation

-     *   - Squid allows (manually escaped) quotes there, but it is impossible to

-     *     authorize with either escaped or unescaped quotes used in digest,

-     *     probably it can't parse the response (?)

-     *   - Both IE and Firefox display realm value with backslashes in

-     *     the password popup and apparently use the same value for digest

-     *

-     * HTTP_Request2 follows IE and Firefox (and hopefully RFC 2617) in

-     * quoted-string handling, unfortunately that means failure to authorize

-     * sometimes

-     *

-     * @param string $headerValue value of WWW-Authenticate or Proxy-Authenticate header

-     *

-     * @return   mixed   associative array with challenge parameters, false if

-     *                   no challenge is present in header value

-     * @throws   HTTP_Request2_NotImplementedException in case of unsupported challenge parameters

-     */

-    protected function parseDigestChallenge($headerValue)

-    {

-        $authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .

-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';

-        $challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";

-        if (!preg_match($challenge, $headerValue, $matches)) {

-            return false;

-        }

-

-        preg_match_all('!' . $authParam . '!', $matches[0], $params);

-        $paramsAry   = array();

-        $knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',

-                             'algorithm', 'qop');

-        for ($i = 0; $i < count($params[0]); $i++) {

-            // section 3.2.1: Any unrecognized directive MUST be ignored.

-            if (in_array($params[1][$i], $knownParams)) {

-                if ('"' == substr($params[2][$i], 0, 1)) {

-                    $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);

-                } else {

-                    $paramsAry[$params[1][$i]] = $params[2][$i];

-                }

-            }

-        }

-        // we only support qop=auth

-        if (!empty($paramsAry['qop'])

-            && !in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))

-        ) {

-            throw new HTTP_Request2_NotImplementedException(

-                "Only 'auth' qop is currently supported in digest authentication, " .

-                "server requested '{$paramsAry['qop']}'"

-            );

-        }

-        // we only support algorithm=MD5

-        if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {

-            throw new HTTP_Request2_NotImplementedException(

-                "Only 'MD5' algorithm is currently supported in digest authentication, " .

-                "server requested '{$paramsAry['algorithm']}'"

-            );

-        }

-

-        return $paramsAry;

-    }

-

-    /**

-     * Parses [Proxy-]Authentication-Info header value and updates challenge

-     *

-     * @param array  &$challenge  challenge to update

-     * @param string $headerValue value of [Proxy-]Authentication-Info header

-     *

-     * @todo     validate server rspauth response

-     */

-    protected function updateChallenge(&$challenge, $headerValue)

-    {

-        $authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .

-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';

-        $paramsAry   = array();

-

-        preg_match_all($authParam, $headerValue, $params);

-        for ($i = 0; $i < count($params[0]); $i++) {

-            if ('"' == substr($params[2][$i], 0, 1)) {

-                $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);

-            } else {

-                $paramsAry[$params[1][$i]] = $params[2][$i];

-            }

-        }

-        // for now, just update the nonce value

-        if (!empty($paramsAry['nextnonce'])) {

-            $challenge['nonce'] = $paramsAry['nextnonce'];

-            $challenge['nc']    = 1;

-        }

-    }

-

-    /**

-     * Creates a value for [Proxy-]Authorization header when using digest authentication

-     *

-     * @param string $user       user name

-     * @param string $password   password

-     * @param string $url        request URL

-     * @param array  &$challenge digest challenge parameters

-     *

-     * @return   string  value of [Proxy-]Authorization request header

-     * @link     http://tools.ietf.org/html/rfc2617#section-3.2.2

-     */

-    protected function createDigestResponse($user, $password, $url, &$challenge)

-    {

-        if (false !== ($q = strpos($url, '?'))

-            && $this->request->getConfig('digest_compat_ie')

-        ) {

-            $url = substr($url, 0, $q);

-        }

-

-        $a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);

-        $a2 = md5($this->request->getMethod() . ':' . $url);

-

-        if (empty($challenge['qop'])) {

-            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);

-        } else {

-            $challenge['cnonce'] = 'Req2.' . rand();

-            if (empty($challenge['nc'])) {

-                $challenge['nc'] = 1;

-            }

-            $nc     = sprintf('%08x', $challenge['nc']++);

-            $digest = md5(

-                $a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .

-                $challenge['cnonce'] . ':auth:' . $a2

-            );

-        }

-        return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .

-               'realm="' . $challenge['realm'] . '", ' .

-               'nonce="' . $challenge['nonce'] . '", ' .

-               'uri="' . $url . '", ' .

-               'response="' . $digest . '"' .

-               (!empty($challenge['opaque'])?

-                ', opaque="' . $challenge['opaque'] . '"':

-                '') .

-               (!empty($challenge['qop'])?

-                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':

-                '');

-    }

-

-    /**

-     * Adds 'Authorization' header (if needed) to request headers array

-     *

-     * @param array  &$headers    request headers

-     * @param string $requestHost request host (needed for digest authentication)

-     * @param string $requestUrl  request URL (needed for digest authentication)

-     *

-     * @throws   HTTP_Request2_NotImplementedException

-     */

-    protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)

-    {

-        if (!($auth = $this->request->getAuth())) {

-            return;

-        }

-        switch ($auth['scheme']) {

-        case HTTP_Request2::AUTH_BASIC:

-            $headers['authorization'] = 'Basic ' . base64_encode(

-                $auth['user'] . ':' . $auth['password']

-            );

-            break;

-

-        case HTTP_Request2::AUTH_DIGEST:

-            unset($this->serverChallenge);

-            $fullUrl = ('/' == $requestUrl[0])?

-                       $this->request->getUrl()->getScheme() . '://' .

-                        $requestHost . $requestUrl:

-                       $requestUrl;

-            foreach (array_keys(self::$challenges) as $key) {

-                if ($key == substr($fullUrl, 0, strlen($key))) {

-                    $headers['authorization'] = $this->createDigestResponse(

-                        $auth['user'], $auth['password'],

-                        $requestUrl, self::$challenges[$key]

-                    );

-                    $this->serverChallenge =& self::$challenges[$key];

-                    break;

-                }

-            }

-            break;

-

-        default:

-            throw new HTTP_Request2_NotImplementedException(

-                "Unknown HTTP authentication scheme '{$auth['scheme']}'"

-            );

-        }

-    }

-

-    /**

-     * Adds 'Proxy-Authorization' header (if needed) to request headers array

-     *

-     * @param array  &$headers   request headers

-     * @param string $requestUrl request URL (needed for digest authentication)

-     *

-     * @throws   HTTP_Request2_NotImplementedException

-     */

-    protected function addProxyAuthorizationHeader(&$headers, $requestUrl)

-    {

-        if (!$this->request->getConfig('proxy_host')

-            || !($user = $this->request->getConfig('proxy_user'))

-            || (0 == strcasecmp('https', $this->request->getUrl()->getScheme())

-                && HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())

-        ) {

-            return;

-        }

-

-        $password = $this->request->getConfig('proxy_password');

-        switch ($this->request->getConfig('proxy_auth_scheme')) {

-        case HTTP_Request2::AUTH_BASIC:

-            $headers['proxy-authorization'] = 'Basic ' . base64_encode(

-                $user . ':' . $password

-            );

-            break;

-

-        case HTTP_Request2::AUTH_DIGEST:

-            unset($this->proxyChallenge);

-            $proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .

-                        ':' . $this->request->getConfig('proxy_port');

-            if (!empty(self::$challenges[$proxyUrl])) {

-                $headers['proxy-authorization'] = $this->createDigestResponse(

-                    $user, $password,

-                    $requestUrl, self::$challenges[$proxyUrl]

-                );

-                $this->proxyChallenge =& self::$challenges[$proxyUrl];

-            }

-            break;

-

-        default:

-            throw new HTTP_Request2_NotImplementedException(

-                "Unknown HTTP authentication scheme '" .

-                $this->request->getConfig('proxy_auth_scheme') . "'"

-            );

-        }

-    }

-

-

-    /**

-     * Creates the string with the Request-Line and request headers

-     *

-     * @return   string

-     * @throws   HTTP_Request2_Exception

-     */

-    protected function prepareHeaders()

-    {

-        $headers = $this->request->getHeaders();

-        $url     = $this->request->getUrl();

-        $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();

-        $host    = $url->getHost();

-

-        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;

-        if (($port = $url->getPort()) && $port != $defaultPort || $connect) {

-            $host .= ':' . (empty($port)? $defaultPort: $port);

-        }

-        // Do not overwrite explicitly set 'Host' header, see bug #16146

-        if (!isset($headers['host'])) {

-            $headers['host'] = $host;

-        }

-

-        if ($connect) {

-            $requestUrl = $host;

-

-        } else {

-            if (!$this->request->getConfig('proxy_host')

-                || 'http' != $this->request->getConfig('proxy_type')

-                || 0 == strcasecmp($url->getScheme(), 'https')

-            ) {

-                $requestUrl = '';

-            } else {

-                $requestUrl = $url->getScheme() . '://' . $host;

-            }

-            $path        = $url->getPath();

-            $query       = $url->getQuery();

-            $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);

-        }

-

-        if ('1.1' == $this->request->getConfig('protocol_version')

-            && extension_loaded('zlib') && !isset($headers['accept-encoding'])

-        ) {

-            $headers['accept-encoding'] = 'gzip, deflate';

-        }

-        if (($jar = $this->request->getCookieJar())

-            && ($cookies = $jar->getMatching($this->request->getUrl(), true))

-        ) {

-            $headers['cookie'] = (empty($headers['cookie'])? '': $headers['cookie'] . '; ') . $cookies;

-        }

-

-        $this->addAuthorizationHeader($headers, $host, $requestUrl);

-        $this->addProxyAuthorizationHeader($headers, $requestUrl);

-        $this->calculateRequestLength($headers);

-        if ('1.1' == $this->request->getConfig('protocol_version')) {

-            $this->updateExpectHeader($headers);

-        } else {

-            $this->expect100Continue = false;

-        }

-

-        $headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .

-                      $this->request->getConfig('protocol_version') . "\r\n";

-        foreach ($headers as $name => $value) {

-            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));

-            $headersStr   .= $canonicalName . ': ' . $value . "\r\n";

-        }

-        return $headersStr . "\r\n";

-    }

-

-    /**

-     * Adds or removes 'Expect: 100-continue' header from request headers

-     *

-     * Also sets the $expect100Continue property. Parsing of existing header

-     * is somewhat needed due to its complex structure and due to the

-     * requirement in section 8.2.3 of RFC 2616:

-     * > A client MUST NOT send an Expect request-header field (section

-     * > 14.20) with the "100-continue" expectation if it does not intend

-     * > to send a request body.

-     *

-     * @param array &$headers Array of headers prepared for the request

-     *

-     * @throws HTTP_Request2_LogicException

-     * @link http://pear.php.net/bugs/bug.php?id=19233

-     * @link http://tools.ietf.org/html/rfc2616#section-8.2.3

-     */

-    protected function updateExpectHeader(&$headers)

-    {

-        $this->expect100Continue = false;

-        $expectations = array();

-        if (isset($headers['expect'])) {

-            if ('' === $headers['expect']) {

-                // empty 'Expect' header is technically invalid, so just get rid of it

-                unset($headers['expect']);

-                return;

-            }

-            // build regexp to parse the value of existing Expect header

-            $expectParam     = ';\s*' . self::REGEXP_TOKEN . '(?:\s*=\s*(?:'

-                               . self::REGEXP_TOKEN . '|'

-                               . self::REGEXP_QUOTED_STRING . '))?\s*';

-            $expectExtension = self::REGEXP_TOKEN . '(?:\s*=\s*(?:'

-                               . self::REGEXP_TOKEN . '|'

-                               . self::REGEXP_QUOTED_STRING . ')\s*(?:'

-                               . $expectParam . ')*)?';

-            $expectItem      = '!(100-continue|' . $expectExtension . ')!A';

-

-            $pos    = 0;

-            $length = strlen($headers['expect']);

-

-            while ($pos < $length) {

-                $pos += strspn($headers['expect'], " \t", $pos);

-                if (',' === substr($headers['expect'], $pos, 1)) {

-                    $pos++;

-                    continue;

-

-                } elseif (!preg_match($expectItem, $headers['expect'], $m, 0, $pos)) {

-                    throw new HTTP_Request2_LogicException(

-                        "Cannot parse value '{$headers['expect']}' of Expect header",

-                        HTTP_Request2_Exception::INVALID_ARGUMENT

-                    );

-

-                } else {

-                    $pos += strlen($m[0]);

-                    if (strcasecmp('100-continue', $m[0])) {

-                        $expectations[]  = $m[0];

-                    }

-                }

-            }

-        }

-

-        if (1024 < $this->contentLength) {

-            $expectations[] = '100-continue';

-            $this->expect100Continue = true;

-        }

-

-        if (empty($expectations)) {

-            unset($headers['expect']);

-        } else {

-            $headers['expect'] = implode(',', $expectations);

-        }

-    }

-

-    /**

-     * Sends the request body

-     *

-     * @throws   HTTP_Request2_MessageException

-     */

-    protected function writeBody()

-    {

-        if (in_array($this->request->getMethod(), self::$bodyDisallowed)

-            || 0 == $this->contentLength

-        ) {

-            return;

-        }

-

-        $position   = 0;

-        $bufferSize = $this->request->getConfig('buffer_size');

-        $headers    = $this->request->getHeaders();

-        $chunked    = isset($headers['transfer-encoding']);

-        while ($position < $this->contentLength) {

-            if (is_string($this->requestBody)) {

-                $str = substr($this->requestBody, $position, $bufferSize);

-            } elseif (is_resource($this->requestBody)) {

-                $str = fread($this->requestBody, $bufferSize);

-            } else {

-                $str = $this->requestBody->read($bufferSize);

-            }

-            if (!$chunked) {

-                $this->socket->write($str);

-            } else {

-                $this->socket->write(dechex(strlen($str)) . "\r\n{$str}\r\n");

-            }

-            // Provide the length of written string to the observer, request #7630

-            $this->request->setLastEvent('sentBodyPart', strlen($str));

-            $position += strlen($str);

-        }

-

-        // write zero-length chunk

-        if ($chunked) {

-            $this->socket->write("0\r\n\r\n");

-        }

-        $this->request->setLastEvent('sentBody', $this->contentLength);

-    }

-

-    /**

-     * Reads the remote server's response

-     *

-     * @return   HTTP_Request2_Response

-     * @throws   HTTP_Request2_Exception

-     */

-    protected function readResponse()

-    {

-        $bufferSize = $this->request->getConfig('buffer_size');

-        // http://tools.ietf.org/html/rfc2616#section-8.2.3

-        // ...the client SHOULD NOT wait for an indefinite period before sending the request body

-        $timeout    = $this->expect100Continue ? 1 : null;

-

-        do {

-            try {

-                $response = new HTTP_Request2_Response(

-                    $this->socket->readLine($bufferSize, $timeout), true, $this->request->getUrl()

-                );

-                do {

-                    $headerLine = $this->socket->readLine($bufferSize);

-                    $response->parseHeaderLine($headerLine);

-                } while ('' != $headerLine);

-

-            } catch (HTTP_Request2_MessageException $e) {

-                if (HTTP_Request2_Exception::TIMEOUT === $e->getCode()

-                    && $this->expect100Continue

-                ) {

-                    return null;

-                }

-                throw $e;

-            }

-            if ($this->expect100Continue && 100 == $response->getStatus()) {

-                return $response;

-            }

-        } while (in_array($response->getStatus(), array(100, 101)));

-

-        $this->request->setLastEvent('receivedHeaders', $response);

-

-        // No body possible in such responses

-        if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod()

-            || (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod()

-                && 200 <= $response->getStatus() && 300 > $response->getStatus())

-            || in_array($response->getStatus(), array(204, 304))

-        ) {

-            return $response;

-        }

-

-        $chunked = 'chunked' == $response->getHeader('transfer-encoding');

-        $length  = $response->getHeader('content-length');

-        $hasBody = false;

-        if ($chunked || null === $length || 0 < intval($length)) {

-            // RFC 2616, section 4.4:

-            // 3. ... If a message is received with both a

-            // Transfer-Encoding header field and a Content-Length header field,

-            // the latter MUST be ignored.

-            $toRead = ($chunked || null === $length)? null: $length;

-            $this->chunkLength = 0;

-

-            while (!$this->socket->eof() && (is_null($toRead) || 0 < $toRead)) {

-                if ($chunked) {

-                    $data = $this->readChunked($bufferSize);

-                } elseif (is_null($toRead)) {

-                    $data = $this->socket->read($bufferSize);

-                } else {

-                    $data    = $this->socket->read(min($toRead, $bufferSize));

-                    $toRead -= strlen($data);

-                }

-                if ('' == $data && (!$this->chunkLength || $this->socket->eof())) {

-                    break;

-                }

-

-                $hasBody = true;

-                if ($this->request->getConfig('store_body')) {

-                    $response->appendBody($data);

-                }

-                if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {

-                    $this->request->setLastEvent('receivedEncodedBodyPart', $data);

-                } else {

-                    $this->request->setLastEvent('receivedBodyPart', $data);

-                }

-            }

-        }

-

-        if ($hasBody) {

-            $this->request->setLastEvent('receivedBody', $response);

-        }

-        return $response;

-    }

-

-    /**

-     * Reads a part of response body encoded with chunked Transfer-Encoding

-     *

-     * @param int $bufferSize buffer size to use for reading

-     *

-     * @return   string

-     * @throws   HTTP_Request2_MessageException

-     */

-    protected function readChunked($bufferSize)

-    {

-        // at start of the next chunk?

-        if (0 == $this->chunkLength) {

-            $line = $this->socket->readLine($bufferSize);

-            if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {

-                throw new HTTP_Request2_MessageException(

-                    "Cannot decode chunked response, invalid chunk length '{$line}'",

-                    HTTP_Request2_Exception::DECODE_ERROR

-                );

-            } else {

-                $this->chunkLength = hexdec($matches[1]);

-                // Chunk with zero length indicates the end

-                if (0 == $this->chunkLength) {

-                    $this->socket->readLine($bufferSize);

-                    return '';

-                }

-            }

-        }

-        $data = $this->socket->read(min($this->chunkLength, $bufferSize));

-        $this->chunkLength -= strlen($data);

-        if (0 == $this->chunkLength) {

-            $this->socket->readLine($bufferSize); // Trailing CRLF

-        }

-        return $data;

-    }

+	/**

+	 * Regular expression for 'token' rule from RFC 2616

+	 */

+	const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';

+

+	/**

+	 * Regular expression for 'quoted-string' rule from RFC 2616

+	 */

+	const REGEXP_QUOTED_STRING = '"(?>[^"\\\\]+|\\\\.)*"';

+

+	/**

+	 * Connected sockets, needed for Keep-Alive support

+	 * @var  array

+	 * @see  connect()

+	 */

+	protected static $sockets = array();

+

+	/**

+	 * Data for digest authentication scheme

+	 *

+	 * The keys for the array are URL prefixes.

+	 *

+	 * The values are associative arrays with data (realm, nonce, nonce-count,

+	 * opaque...) needed for digest authentication. Stored here to prevent making

+	 * duplicate requests to digest-protected resources after we have already

+	 * received the challenge.

+	 *

+	 * @var  array

+	 */

+	protected static $challenges = array();

+

+	/**

+	 * Connected socket

+	 * @var  HTTP_Request2_SocketWrapper

+	 * @see  connect()

+	 */

+	protected $socket;

+

+	/**

+	 * Challenge used for server digest authentication

+	 * @var  array

+	 */

+	protected $serverChallenge;

+

+	/**

+	 * Challenge used for proxy digest authentication

+	 * @var  array

+	 */

+	protected $proxyChallenge;

+

+	/**

+	 * Remaining length of the current chunk, when reading chunked response

+	 * @var  integer

+	 * @see  readChunked()

+	 */

+	protected $chunkLength = 0;

+

+	/**

+	 * Remaining amount of redirections to follow

+	 *

+	 * Starts at 'max_redirects' configuration parameter and is reduced on each

+	 * subsequent redirect. An Exception will be thrown once it reaches zero.

+	 *

+	 * @var  integer

+	 */

+	protected $redirectCountdown = null;

+

+	/**

+	 * Whether to wait for "100 Continue" response before sending request body

+	 * @var bool

+	 */

+	protected $expect100Continue = false;

+

+	/**

+	 * Sends request to the remote server and returns its response

+	 *

+	 * @param HTTP_Request2 $request HTTP request message

+	 *

+	 * @return   HTTP_Request2_Response

+	 * @throws   HTTP_Request2_Exception

+	 */

+	public function sendRequest(HTTP_Request2 $request)

+	{

+		$this->request = $request;

+

+		try {

+			$keepAlive = $this->connect();

+			$headers   = $this->prepareHeaders();

+			$this->socket->write($headers);

+			// provide request headers to the observer, see request #7633

+			$this->request->setLastEvent('sentHeaders', $headers);

+

+			if (!$this->expect100Continue) {

+				$this->writeBody();

+				$response = $this->readResponse();

+

+			} else {

+				$response = $this->readResponse();

+				if (!$response || 100 == $response->getStatus()) {

+					$this->expect100Continue = false;

+					// either got "100 Continue" or timed out -> send body

+					$this->writeBody();

+					$response = $this->readResponse();

+				}

+			}

+

+

+			if ($jar = $request->getCookieJar()) {

+				$jar->addCookiesFromResponse($response, $request->getUrl());

+			}

+

+			if (!$this->canKeepAlive($keepAlive, $response)) {

+				$this->disconnect();

+			}

+

+			if ($this->shouldUseProxyDigestAuth($response)) {

+				return $this->sendRequest($request);

+			}

+			if ($this->shouldUseServerDigestAuth($response)) {

+				return $this->sendRequest($request);

+			}

+			if ($authInfo = $response->getHeader('authentication-info')) {

+				$this->updateChallenge($this->serverChallenge, $authInfo);

+			}

+			if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {

+				$this->updateChallenge($this->proxyChallenge, $proxyInfo);

+			}

+

+		} catch (Exception $e) {

+			$this->disconnect();

+		}

+

+		unset($this->request, $this->requestBody);

+

+		if (!empty($e)) {

+			$this->redirectCountdown = null;

+			throw $e;

+		}

+

+		if (!$request->getConfig('follow_redirects') || !$response->isRedirect()) {

+			$this->redirectCountdown = null;

+			return $response;

+		} else {

+			return $this->handleRedirect($request, $response);

+		}

+	}

+

+	/**

+	 * Connects to the remote server

+	 *

+	 * @return   bool    whether the connection can be persistent

+	 * @throws   HTTP_Request2_Exception

+	 */

+	protected function connect()

+	{

+		$secure  = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');

+		$tunnel  = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();

+		$headers = $this->request->getHeaders();

+		$reqHost = $this->request->getUrl()->getHost();

+		if (!($reqPort = $this->request->getUrl()->getPort())) {

+			$reqPort = $secure? 443: 80;

+		}

+

+		$httpProxy = $socksProxy = false;

+		if (!($host = $this->request->getConfig('proxy_host'))) {

+			$host = $reqHost;

+			$port = $reqPort;

+		} else {

+			if (!($port = $this->request->getConfig('proxy_port'))) {

+				throw new HTTP_Request2_LogicException(

+					'Proxy port not provided',

+					HTTP_Request2_Exception::MISSING_VALUE

+				);

+			}

+			if ('http' == ($type = $this->request->getConfig('proxy_type'))) {

+				$httpProxy = true;

+			} elseif ('socks5' == $type) {

+				$socksProxy = true;

+			} else {

+				throw new HTTP_Request2_NotImplementedException(

+					"Proxy type '{$type}' is not supported"

+				);

+			}

+		}

+

+		if ($tunnel && !$httpProxy) {

+			throw new HTTP_Request2_LogicException(

+				"Trying to perform CONNECT request without proxy",

+				HTTP_Request2_Exception::MISSING_VALUE

+			);

+		}

+		if ($secure && !in_array('ssl', stream_get_transports())) {

+			throw new HTTP_Request2_LogicException(

+				'Need OpenSSL support for https:// requests',

+				HTTP_Request2_Exception::MISCONFIGURATION

+			);

+		}

+

+		// RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive

+		// connection token to a proxy server...

+		if ($httpProxy && !$secure && !empty($headers['connection'])

+			&& 'Keep-Alive' == $headers['connection']

+		) {

+			$this->request->setHeader('connection');

+		}

+

+		$keepAlive = ('1.1' == $this->request->getConfig('protocol_version') &&

+					  empty($headers['connection'])) ||

+					 (!empty($headers['connection']) &&

+					  'Keep-Alive' == $headers['connection']);

+

+		$options = array();

+		if ($ip = $this->request->getConfig('local_ip')) {

+			$options['socket'] = array(

+				'bindto' => (false === strpos($ip, ':') ? $ip : '[' . $ip . ']') . ':0'

+			);

+		}

+		if ($secure || $tunnel) {

+			$options['ssl'] = array();

+			foreach ($this->request->getConfig() as $name => $value) {

+				if ('ssl_' == substr($name, 0, 4) && null !== $value) {

+					if ('ssl_verify_host' == $name) {

+						if ($value) {

+							$options['ssl']['CN_match'] = $reqHost;

+						}

+					} else {

+						$options['ssl'][substr($name, 4)] = $value;

+					}

+				}

+			}

+			ksort($options['ssl']);

+		}

+

+		// Use global request timeout if given, see feature requests #5735, #8964

+		if ($timeout = $this->request->getConfig('timeout')) {

+			$deadline = time() + $timeout;

+		} else {

+			$deadline = null;

+		}

+

+		// Changing SSL context options after connection is established does *not*

+		// work, we need a new connection if options change

+		$remote    = ((!$secure || $httpProxy || $socksProxy)? 'tcp://': 'ssl://')

+					 . $host . ':' . $port;

+		$socketKey = $remote . (

+						($secure && $httpProxy || $socksProxy)

+						? "->{$reqHost}:{$reqPort}" : ''

+					 ) . (empty($options)? '': ':' . serialize($options));

+		unset($this->socket);

+

+		// We use persistent connections and have a connected socket?

+		// Ensure that the socket is still connected, see bug #16149

+		if ($keepAlive && !empty(self::$sockets[$socketKey])

+			&& !self::$sockets[$socketKey]->eof()

+		) {

+			$this->socket =& self::$sockets[$socketKey];

+

+		} else {

+			if ($socksProxy) {

+				require_once 'HTTP/Request2/SOCKS5.php';

+

+				$this->socket = new HTTP_Request2_SOCKS5(

+					$remote, $this->request->getConfig('connect_timeout'),

+					$options, $this->request->getConfig('proxy_user'),

+					$this->request->getConfig('proxy_password')

+				);

+				// handle request timeouts ASAP

+				$this->socket->setDeadline($deadline, $this->request->getConfig('timeout'));

+				$this->socket->connect($reqHost, $reqPort);

+				if (!$secure) {

+					$conninfo = "tcp://{$reqHost}:{$reqPort} via {$remote}";

+				} else {

+					$this->socket->enableCrypto();

+					$conninfo = "ssl://{$reqHost}:{$reqPort} via {$remote}";

+				}

+

+			} elseif ($secure && $httpProxy && !$tunnel) {

+				$this->establishTunnel();

+				$conninfo = "ssl://{$reqHost}:{$reqPort} via {$remote}";

+

+			} else {

+				$this->socket = new HTTP_Request2_SocketWrapper(

+					$remote, $this->request->getConfig('connect_timeout'), $options

+				);

+			}

+			$this->request->setLastEvent('connect', empty($conninfo)? $remote: $conninfo);

+			self::$sockets[$socketKey] =& $this->socket;

+		}

+		$this->socket->setDeadline($deadline, $this->request->getConfig('timeout'));

+		return $keepAlive;

+	}

+

+	/**

+	 * Establishes a tunnel to a secure remote server via HTTP CONNECT request

+	 *

+	 * This method will fail if 'ssl_verify_peer' is enabled. Probably because PHP

+	 * sees that we are connected to a proxy server (duh!) rather than the server

+	 * that presents its certificate.

+	 *

+	 * @link     http://tools.ietf.org/html/rfc2817#section-5.2

+	 * @throws   HTTP_Request2_Exception

+	 */

+	protected function establishTunnel()

+	{

+		$donor   = new self;

+		$connect = new HTTP_Request2(

+			$this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,

+			array_merge($this->request->getConfig(), array('adapter' => $donor))

+		);

+		$response = $connect->send();

+		// Need any successful (2XX) response

+		if (200 > $response->getStatus() || 300 <= $response->getStatus()) {

+			throw new HTTP_Request2_ConnectionException(

+				'Failed to connect via HTTPS proxy. Proxy response: ' .

+				$response->getStatus() . ' ' . $response->getReasonPhrase()

+			);

+		}

+		$this->socket = $donor->socket;

+		$this->socket->enableCrypto();

+	}

+

+	/**

+	 * Checks whether current connection may be reused or should be closed

+	 *

+	 * @param boolean                $requestKeepAlive whether connection could

+	 *                               be persistent in the first place

+	 * @param HTTP_Request2_Response $response         response object to check

+	 *

+	 * @return   boolean

+	 */

+	protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)

+	{

+		// Do not close socket on successful CONNECT request

+		if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod()

+			&& 200 <= $response->getStatus() && 300 > $response->getStatus()

+		) {

+			return true;

+		}

+

+		$lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding'))

+					   || null !== $response->getHeader('content-length')

+					   // no body possible for such responses, see also request #17031

+					   || HTTP_Request2::METHOD_HEAD == $this->request->getMethod()

+					   || in_array($response->getStatus(), array(204, 304));

+		$persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||

+					   (null === $response->getHeader('connection') &&

+						'1.1' == $response->getVersion());

+		return $requestKeepAlive && $lengthKnown && $persistent;

+	}

+

+	/**

+	 * Disconnects from the remote server

+	 */

+	protected function disconnect()

+	{

+		if (!empty($this->socket)) {

+			$this->socket = null;

+			$this->request->setLastEvent('disconnect');

+		}

+	}

+

+	/**

+	 * Handles HTTP redirection

+	 *

+	 * This method will throw an Exception if redirect to a non-HTTP(S) location

+	 * is attempted, also if number of redirects performed already is equal to

+	 * 'max_redirects' configuration parameter.

+	 *

+	 * @param HTTP_Request2          $request  Original request

+	 * @param HTTP_Request2_Response $response Response containing redirect

+	 *

+	 * @return   HTTP_Request2_Response      Response from a new location

+	 * @throws   HTTP_Request2_Exception

+	 */

+	protected function handleRedirect(

+		HTTP_Request2 $request, HTTP_Request2_Response $response

+	) {

+		if (is_null($this->redirectCountdown)) {

+			$this->redirectCountdown = $request->getConfig('max_redirects');

+		}

+		if (0 == $this->redirectCountdown) {

+			$this->redirectCountdown = null;

+			// Copying cURL behaviour

+			throw new HTTP_Request2_MessageException(

+				'Maximum (' . $request->getConfig('max_redirects') . ') redirects followed',

+				HTTP_Request2_Exception::TOO_MANY_REDIRECTS

+			);

+		}

+		$redirectUrl = new Net_URL2(

+			$response->getHeader('location'),

+			array(Net_URL2::OPTION_USE_BRACKETS => $request->getConfig('use_brackets'))

+		);

+		// refuse non-HTTP redirect

+		if ($redirectUrl->isAbsolute()

+			&& !in_array($redirectUrl->getScheme(), array('http', 'https'))

+		) {

+			$this->redirectCountdown = null;

+			throw new HTTP_Request2_MessageException(

+				'Refusing to redirect to a non-HTTP URL ' . $redirectUrl->__toString(),

+				HTTP_Request2_Exception::NON_HTTP_REDIRECT

+			);

+		}

+		// Theoretically URL should be absolute (see http://tools.ietf.org/html/rfc2616#section-14.30),

+		// but in practice it is often not

+		if (!$redirectUrl->isAbsolute()) {

+			$redirectUrl = $request->getUrl()->resolve($redirectUrl);

+		}

+		$redirect = clone $request;

+		$redirect->setUrl($redirectUrl);

+		if (303 == $response->getStatus()

+			|| (!$request->getConfig('strict_redirects')

+				&& in_array($response->getStatus(), array(301, 302)))

+		) {

+			$redirect->setMethod(HTTP_Request2::METHOD_GET);

+			$redirect->setBody('');

+		}

+

+		if (0 < $this->redirectCountdown) {

+			$this->redirectCountdown--;

+		}

+		return $this->sendRequest($redirect);

+	}

+

+	/**

+	 * Checks whether another request should be performed with server digest auth

+	 *

+	 * Several conditions should be satisfied for it to return true:

+	 *   - response status should be 401

+	 *   - auth credentials should be set in the request object

+	 *   - response should contain WWW-Authenticate header with digest challenge

+	 *   - there is either no challenge stored for this URL or new challenge

+	 *     contains stale=true parameter (in other case we probably just failed

+	 *     due to invalid username / password)

+	 *

+	 * The method stores challenge values in $challenges static property

+	 *

+	 * @param HTTP_Request2_Response $response response to check

+	 *

+	 * @return   boolean whether another request should be performed

+	 * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters

+	 */

+	protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)

+	{

+		// no sense repeating a request if we don't have credentials

+		if (401 != $response->getStatus() || !$this->request->getAuth()) {

+			return false;

+		}

+		if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {

+			return false;

+		}

+

+		$url    = $this->request->getUrl();

+		$scheme = $url->getScheme();

+		$host   = $scheme . '://' . $url->getHost();

+		if ($port = $url->getPort()) {

+			if ((0 == strcasecmp($scheme, 'http') && 80 != $port)

+				|| (0 == strcasecmp($scheme, 'https') && 443 != $port)

+			) {

+				$host .= ':' . $port;

+			}

+		}

+

+		if (!empty($challenge['domain'])) {

+			$prefixes = array();

+			foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {

+				// don't bother with different servers

+				if ('/' == substr($prefix, 0, 1)) {

+					$prefixes[] = $host . $prefix;

+				}

+			}

+		}

+		if (empty($prefixes)) {

+			$prefixes = array($host . '/');

+		}

+

+		$ret = true;

+		foreach ($prefixes as $prefix) {

+			if (!empty(self::$challenges[$prefix])

+				&& (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))

+			) {

+				// probably credentials are invalid

+				$ret = false;

+			}

+			self::$challenges[$prefix] =& $challenge;

+		}

+		return $ret;

+	}

+

+	/**

+	 * Checks whether another request should be performed with proxy digest auth

+	 *

+	 * Several conditions should be satisfied for it to return true:

+	 *   - response status should be 407

+	 *   - proxy auth credentials should be set in the request object

+	 *   - response should contain Proxy-Authenticate header with digest challenge

+	 *   - there is either no challenge stored for this proxy or new challenge

+	 *     contains stale=true parameter (in other case we probably just failed

+	 *     due to invalid username / password)

+	 *

+	 * The method stores challenge values in $challenges static property

+	 *

+	 * @param HTTP_Request2_Response $response response to check

+	 *

+	 * @return   boolean whether another request should be performed

+	 * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters

+	 */

+	protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)

+	{

+		if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {

+			return false;

+		}

+		if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {

+			return false;

+		}

+

+		$key = 'proxy://' . $this->request->getConfig('proxy_host') .

+			   ':' . $this->request->getConfig('proxy_port');

+

+		if (!empty(self::$challenges[$key])

+			&& (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))

+		) {

+			$ret = false;

+		} else {

+			$ret = true;

+		}

+		self::$challenges[$key] = $challenge;

+		return $ret;

+	}

+

+	/**

+	 * Extracts digest method challenge from (WWW|Proxy)-Authenticate header value

+	 *

+	 * There is a problem with implementation of RFC 2617: several of the parameters

+	 * are defined as quoted-string there and thus may contain backslash escaped

+	 * double quotes (RFC 2616, section 2.2). However, RFC 2617 defines unq(X) as

+	 * just value of quoted-string X without surrounding quotes, it doesn't speak

+	 * about removing backslash escaping.

+	 *

+	 * Now realm parameter is user-defined and human-readable, strange things

+	 * happen when it contains quotes:

+	 *   - Apache allows quotes in realm, but apparently uses realm value without

+	 *     backslashes for digest computation

+	 *   - Squid allows (manually escaped) quotes there, but it is impossible to

+	 *     authorize with either escaped or unescaped quotes used in digest,

+	 *     probably it can't parse the response (?)

+	 *   - Both IE and Firefox display realm value with backslashes in

+	 *     the password popup and apparently use the same value for digest

+	 *

+	 * HTTP_Request2 follows IE and Firefox (and hopefully RFC 2617) in

+	 * quoted-string handling, unfortunately that means failure to authorize

+	 * sometimes

+	 *

+	 * @param string $headerValue value of WWW-Authenticate or Proxy-Authenticate header

+	 *

+	 * @return   mixed   associative array with challenge parameters, false if

+	 *                   no challenge is present in header value

+	 * @throws   HTTP_Request2_NotImplementedException in case of unsupported challenge parameters

+	 */

+	protected function parseDigestChallenge($headerValue)

+	{

+		$authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .

+					   self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';

+		$challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";

+		if (!preg_match($challenge, $headerValue, $matches)) {

+			return false;

+		}

+

+		preg_match_all('!' . $authParam . '!', $matches[0], $params);

+		$paramsAry   = array();

+		$knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',

+							 'algorithm', 'qop');

+		for ($i = 0; $i < count($params[0]); $i++) {

+			// section 3.2.1: Any unrecognized directive MUST be ignored.

+			if (in_array($params[1][$i], $knownParams)) {

+				if ('"' == substr($params[2][$i], 0, 1)) {

+					$paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);

+				} else {

+					$paramsAry[$params[1][$i]] = $params[2][$i];

+				}

+			}

+		}

+		// we only support qop=auth

+		if (!empty($paramsAry['qop'])

+			&& !in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))

+		) {

+			throw new HTTP_Request2_NotImplementedException(

+				"Only 'auth' qop is currently supported in digest authentication, " .

+				"server requested '{$paramsAry['qop']}'"

+			);

+		}

+		// we only support algorithm=MD5

+		if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {

+			throw new HTTP_Request2_NotImplementedException(

+				"Only 'MD5' algorithm is currently supported in digest authentication, " .

+				"server requested '{$paramsAry['algorithm']}'"

+			);

+		}

+

+		return $paramsAry;

+	}

+

+	/**

+	 * Parses [Proxy-]Authentication-Info header value and updates challenge

+	 *

+	 * @param array  &$challenge  challenge to update

+	 * @param string $headerValue value of [Proxy-]Authentication-Info header

+	 *

+	 * @todo     validate server rspauth response

+	 */

+	protected function updateChallenge(&$challenge, $headerValue)

+	{

+		$authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .

+					   self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';

+		$paramsAry   = array();

+

+		preg_match_all($authParam, $headerValue, $params);

+		for ($i = 0; $i < count($params[0]); $i++) {

+			if ('"' == substr($params[2][$i], 0, 1)) {

+				$paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);

+			} else {

+				$paramsAry[$params[1][$i]] = $params[2][$i];

+			}

+		}

+		// for now, just update the nonce value

+		if (!empty($paramsAry['nextnonce'])) {

+			$challenge['nonce'] = $paramsAry['nextnonce'];

+			$challenge['nc']    = 1;

+		}

+	}

+

+	/**

+	 * Creates a value for [Proxy-]Authorization header when using digest authentication

+	 *

+	 * @param string $user       user name

+	 * @param string $password   password

+	 * @param string $url        request URL

+	 * @param array  &$challenge digest challenge parameters

+	 *

+	 * @return   string  value of [Proxy-]Authorization request header

+	 * @link     http://tools.ietf.org/html/rfc2617#section-3.2.2

+	 */

+	protected function createDigestResponse($user, $password, $url, &$challenge)

+	{

+		if (false !== ($q = strpos($url, '?'))

+			&& $this->request->getConfig('digest_compat_ie')

+		) {

+			$url = substr($url, 0, $q);

+		}

+

+		$a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);

+		$a2 = md5($this->request->getMethod() . ':' . $url);

+

+		if (empty($challenge['qop'])) {

+			$digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);

+		} else {

+			$challenge['cnonce'] = 'Req2.' . rand();

+			if (empty($challenge['nc'])) {

+				$challenge['nc'] = 1;

+			}

+			$nc     = sprintf('%08x', $challenge['nc']++);

+			$digest = md5(

+				$a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .

+				$challenge['cnonce'] . ':auth:' . $a2

+			);

+		}

+		return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .

+			   'realm="' . $challenge['realm'] . '", ' .

+			   'nonce="' . $challenge['nonce'] . '", ' .

+			   'uri="' . $url . '", ' .

+			   'response="' . $digest . '"' .

+			   (!empty($challenge['opaque'])?

+				', opaque="' . $challenge['opaque'] . '"':

+				'') .

+			   (!empty($challenge['qop'])?

+				', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':

+				'');

+	}

+

+	/**

+	 * Adds 'Authorization' header (if needed) to request headers array

+	 *

+	 * @param array  &$headers    request headers

+	 * @param string $requestHost request host (needed for digest authentication)

+	 * @param string $requestUrl  request URL (needed for digest authentication)

+	 *

+	 * @throws   HTTP_Request2_NotImplementedException

+	 */

+	protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)

+	{

+		if (!($auth = $this->request->getAuth())) {

+			return;

+		}

+		switch ($auth['scheme']) {

+		case HTTP_Request2::AUTH_BASIC:

+			$headers['authorization'] = 'Basic ' . base64_encode(

+				$auth['user'] . ':' . $auth['password']

+			);

+			break;

+

+		case HTTP_Request2::AUTH_DIGEST:

+			unset($this->serverChallenge);

+			$fullUrl = ('/' == $requestUrl[0])?

+					   $this->request->getUrl()->getScheme() . '://' .

+						$requestHost . $requestUrl:

+					   $requestUrl;

+			foreach (array_keys(self::$challenges) as $key) {

+				if ($key == substr($fullUrl, 0, strlen($key))) {

+					$headers['authorization'] = $this->createDigestResponse(

+						$auth['user'], $auth['password'],

+						$requestUrl, self::$challenges[$key]

+					);

+					$this->serverChallenge =& self::$challenges[$key];

+					break;

+				}

+			}

+			break;

+

+		default:

+			throw new HTTP_Request2_NotImplementedException(

+				"Unknown HTTP authentication scheme '{$auth['scheme']}'"

+			);

+		}

+	}

+

+	/**

+	 * Adds 'Proxy-Authorization' header (if needed) to request headers array

+	 *

+	 * @param array  &$headers   request headers

+	 * @param string $requestUrl request URL (needed for digest authentication)

+	 *

+	 * @throws   HTTP_Request2_NotImplementedException

+	 */

+	protected function addProxyAuthorizationHeader(&$headers, $requestUrl)

+	{

+		if (!$this->request->getConfig('proxy_host')

+			|| !($user = $this->request->getConfig('proxy_user'))

+			|| (0 == strcasecmp('https', $this->request->getUrl()->getScheme())

+				&& HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())

+		) {

+			return;

+		}

+

+		$password = $this->request->getConfig('proxy_password');

+		switch ($this->request->getConfig('proxy_auth_scheme')) {

+		case HTTP_Request2::AUTH_BASIC:

+			$headers['proxy-authorization'] = 'Basic ' . base64_encode(

+				$user . ':' . $password

+			);

+			break;

+

+		case HTTP_Request2::AUTH_DIGEST:

+			unset($this->proxyChallenge);

+			$proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .

+						':' . $this->request->getConfig('proxy_port');

+			if (!empty(self::$challenges[$proxyUrl])) {

+				$headers['proxy-authorization'] = $this->createDigestResponse(

+					$user, $password,

+					$requestUrl, self::$challenges[$proxyUrl]

+				);

+				$this->proxyChallenge =& self::$challenges[$proxyUrl];

+			}

+			break;

+

+		default:

+			throw new HTTP_Request2_NotImplementedException(

+				"Unknown HTTP authentication scheme '" .

+				$this->request->getConfig('proxy_auth_scheme') . "'"

+			);

+		}

+	}

+

+

+	/**

+	 * Creates the string with the Request-Line and request headers

+	 *

+	 * @return   string

+	 * @throws   HTTP_Request2_Exception

+	 */

+	protected function prepareHeaders()

+	{

+		$headers = $this->request->getHeaders();

+		$url     = $this->request->getUrl();

+		$connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();

+		$host    = $url->getHost();

+

+		$defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;

+		if (($port = $url->getPort()) && $port != $defaultPort || $connect) {

+			$host .= ':' . (empty($port)? $defaultPort: $port);

+		}

+		// Do not overwrite explicitly set 'Host' header, see bug #16146

+		if (!isset($headers['host'])) {

+			$headers['host'] = $host;

+		}

+

+		if ($connect) {

+			$requestUrl = $host;

+

+		} else {

+			if (!$this->request->getConfig('proxy_host')

+				|| 'http' != $this->request->getConfig('proxy_type')

+				|| 0 == strcasecmp($url->getScheme(), 'https')

+			) {

+				$requestUrl = '';

+			} else {

+				$requestUrl = $url->getScheme() . '://' . $host;

+			}

+			$path        = $url->getPath();

+			$query       = $url->getQuery();

+			$requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);

+		}

+

+		if ('1.1' == $this->request->getConfig('protocol_version')

+			&& extension_loaded('zlib') && !isset($headers['accept-encoding'])

+		) {

+			$headers['accept-encoding'] = 'gzip, deflate';

+		}

+		if (($jar = $this->request->getCookieJar())

+			&& ($cookies = $jar->getMatching($this->request->getUrl(), true))

+		) {

+			$headers['cookie'] = (empty($headers['cookie'])? '': $headers['cookie'] . '; ') . $cookies;

+		}

+

+		$this->addAuthorizationHeader($headers, $host, $requestUrl);

+		$this->addProxyAuthorizationHeader($headers, $requestUrl);

+		$this->calculateRequestLength($headers);

+		if ('1.1' == $this->request->getConfig('protocol_version')) {

+			$this->updateExpectHeader($headers);

+		} else {

+			$this->expect100Continue = false;

+		}

+

+		$headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .

+					  $this->request->getConfig('protocol_version') . "\r\n";

+		foreach ($headers as $name => $value) {

+			$canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));

+			$headersStr   .= $canonicalName . ': ' . $value . "\r\n";

+		}

+		return $headersStr . "\r\n";

+	}

+

+	/**

+	 * Adds or removes 'Expect: 100-continue' header from request headers

+	 *

+	 * Also sets the $expect100Continue property. Parsing of existing header

+	 * is somewhat needed due to its complex structure and due to the

+	 * requirement in section 8.2.3 of RFC 2616:

+	 * > A client MUST NOT send an Expect request-header field (section

+	 * > 14.20) with the "100-continue" expectation if it does not intend

+	 * > to send a request body.

+	 *

+	 * @param array &$headers Array of headers prepared for the request

+	 *

+	 * @throws HTTP_Request2_LogicException

+	 * @link http://pear.php.net/bugs/bug.php?id=19233

+	 * @link http://tools.ietf.org/html/rfc2616#section-8.2.3

+	 */

+	protected function updateExpectHeader(&$headers)

+	{

+		$this->expect100Continue = false;

+		$expectations = array();

+		if (isset($headers['expect'])) {

+			if ('' === $headers['expect']) {

+				// empty 'Expect' header is technically invalid, so just get rid of it

+				unset($headers['expect']);

+				return;

+			}

+			// build regexp to parse the value of existing Expect header

+			$expectParam     = ';\s*' . self::REGEXP_TOKEN . '(?:\s*=\s*(?:'

+							   . self::REGEXP_TOKEN . '|'

+							   . self::REGEXP_QUOTED_STRING . '))?\s*';

+			$expectExtension = self::REGEXP_TOKEN . '(?:\s*=\s*(?:'

+							   . self::REGEXP_TOKEN . '|'

+							   . self::REGEXP_QUOTED_STRING . ')\s*(?:'

+							   . $expectParam . ')*)?';

+			$expectItem      = '!(100-continue|' . $expectExtension . ')!A';

+

+			$pos    = 0;

+			$length = strlen($headers['expect']);

+

+			while ($pos < $length) {

+				$pos += strspn($headers['expect'], " \t", $pos);

+				if (',' === substr($headers['expect'], $pos, 1)) {

+					$pos++;

+					continue;

+

+				} elseif (!preg_match($expectItem, $headers['expect'], $m, 0, $pos)) {

+					throw new HTTP_Request2_LogicException(

+						"Cannot parse value '{$headers['expect']}' of Expect header",

+						HTTP_Request2_Exception::INVALID_ARGUMENT

+					);

+

+				} else {

+					$pos += strlen($m[0]);

+					if (strcasecmp('100-continue', $m[0])) {

+						$expectations[]  = $m[0];

+					}

+				}

+			}

+		}

+

+		if (1024 < $this->contentLength) {

+			$expectations[] = '100-continue';

+			$this->expect100Continue = true;

+		}

+

+		if (empty($expectations)) {

+			unset($headers['expect']);

+		} else {

+			$headers['expect'] = implode(',', $expectations);

+		}

+	}

+

+	/**

+	 * Sends the request body

+	 *

+	 * @throws   HTTP_Request2_MessageException

+	 */

+	protected function writeBody()

+	{

+		if (in_array($this->request->getMethod(), self::$bodyDisallowed)

+			|| 0 == $this->contentLength

+		) {

+			return;

+		}

+

+		$position   = 0;

+		$bufferSize = $this->request->getConfig('buffer_size');

+		$headers    = $this->request->getHeaders();

+		$chunked    = isset($headers['transfer-encoding']);

+		while ($position < $this->contentLength) {

+			if (is_string($this->requestBody)) {

+				$str = substr($this->requestBody, $position, $bufferSize);

+			} elseif (is_resource($this->requestBody)) {

+				$str = fread($this->requestBody, $bufferSize);

+			} else {

+				$str = $this->requestBody->read($bufferSize);

+			}

+			if (!$chunked) {

+				$this->socket->write($str);

+			} else {

+				$this->socket->write(dechex(strlen($str)) . "\r\n{$str}\r\n");

+			}

+			// Provide the length of written string to the observer, request #7630

+			$this->request->setLastEvent('sentBodyPart', strlen($str));

+			$position += strlen($str);

+		}

+

+		// write zero-length chunk

+		if ($chunked) {

+			$this->socket->write("0\r\n\r\n");

+		}

+		$this->request->setLastEvent('sentBody', $this->contentLength);

+	}

+

+	/**

+	 * Reads the remote server's response

+	 *

+	 * @return   HTTP_Request2_Response

+	 * @throws   HTTP_Request2_Exception

+	 */

+	protected function readResponse()

+	{

+		$bufferSize = $this->request->getConfig('buffer_size');

+		// http://tools.ietf.org/html/rfc2616#section-8.2.3

+		// ...the client SHOULD NOT wait for an indefinite period before sending the request body

+		$timeout    = $this->expect100Continue ? 1 : null;

+

+		do {

+			try {

+				$response = new HTTP_Request2_Response(

+					$this->socket->readLine($bufferSize, $timeout), true, $this->request->getUrl()

+				);

+				do {

+					$headerLine = $this->socket->readLine($bufferSize);

+					$response->parseHeaderLine($headerLine);

+				} while ('' != $headerLine);

+

+			} catch (HTTP_Request2_MessageException $e) {

+				if (HTTP_Request2_Exception::TIMEOUT === $e->getCode()

+					&& $this->expect100Continue

+				) {

+					return null;

+				}

+				throw $e;

+			}

+			if ($this->expect100Continue && 100 == $response->getStatus()) {

+				return $response;

+			}

+		} while (in_array($response->getStatus(), array(100, 101)));

+

+		$this->request->setLastEvent('receivedHeaders', $response);

+

+		// No body possible in such responses

+		if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod()

+			|| (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod()

+				&& 200 <= $response->getStatus() && 300 > $response->getStatus())

+			|| in_array($response->getStatus(), array(204, 304))

+		) {

+			return $response;

+		}

+

+		$chunked = 'chunked' == $response->getHeader('transfer-encoding');

+		$length  = $response->getHeader('content-length');

+		$hasBody = false;

+		if ($chunked || null === $length || 0 < intval($length)) {

+			// RFC 2616, section 4.4:

+			// 3. ... If a message is received with both a

+			// Transfer-Encoding header field and a Content-Length header field,

+			// the latter MUST be ignored.

+			$toRead = ($chunked || null === $length)? null: $length;

+			$this->chunkLength = 0;

+

+			while (!$this->socket->eof() && (is_null($toRead) || 0 < $toRead)) {

+				if ($chunked) {

+					$data = $this->readChunked($bufferSize);

+				} elseif (is_null($toRead)) {

+					$data = $this->socket->read($bufferSize);

+				} else {

+					$data    = $this->socket->read(min($toRead, $bufferSize));

+					$toRead -= strlen($data);

+				}

+				if ('' == $data && (!$this->chunkLength || $this->socket->eof())) {

+					break;

+				}

+

+				$hasBody = true;

+				if ($this->request->getConfig('store_body')) {

+					$response->appendBody($data);

+				}

+				if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {

+					$this->request->setLastEvent('receivedEncodedBodyPart', $data);

+				} else {

+					$this->request->setLastEvent('receivedBodyPart', $data);

+				}

+			}

+		}

+

+		if ($hasBody) {

+			$this->request->setLastEvent('receivedBody', $response);

+		}

+		return $response;

+	}

+

+	/**

+	 * Reads a part of response body encoded with chunked Transfer-Encoding

+	 *

+	 * @param int $bufferSize buffer size to use for reading

+	 *

+	 * @return   string

+	 * @throws   HTTP_Request2_MessageException

+	 */

+	protected function readChunked($bufferSize)

+	{

+		// at start of the next chunk?

+		if (0 == $this->chunkLength) {

+			$line = $this->socket->readLine($bufferSize);

+			if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {

+				throw new HTTP_Request2_MessageException(

+					"Cannot decode chunked response, invalid chunk length '{$line}'",

+					HTTP_Request2_Exception::DECODE_ERROR

+				);

+			} else {

+				$this->chunkLength = hexdec($matches[1]);

+				// Chunk with zero length indicates the end

+				if (0 == $this->chunkLength) {

+					$this->socket->readLine($bufferSize);

+					return '';

+				}

+			}

+		}

+		$data = $this->socket->read(min($this->chunkLength, $bufferSize));

+		$this->chunkLength -= strlen($data);

+		if (0 == $this->chunkLength) {

+			$this->socket->readLine($bufferSize); // Trailing CRLF

+		}

+		return $data;

+	}

 }

 

 ?>
\ No newline at end of file