xpressengine / xe-core

classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
 			if($column->name === 'query')

 			{

 				$this->columns[] = new QueryTag($column, true);

-			}

-			else

+			} else

 			{

 				$this->columns[] = new UpdateColumnTag($column);

 			}

Spacing +7 added lines, -7 removed lines

@@ -28,14 +28,14 @@ 
 	{

 		$this->columns = array();

 

-		if(!is_array($xml_columns))

+		if (!is_array($xml_columns))

 		{

 			$xml_columns = array($xml_columns);

 		}

 

-		foreach($xml_columns as $column)

+		foreach ($xml_columns as $column)

 		{

-			if($column->name === 'query')

+			if ($column->name === 'query')

 			{

 				$this->columns[] = new QueryTag($column, true);

 			}

@@ -53,10 +53,10 @@ 
 	 */

 	function toString()

 	{

-		$output_columns = 'array(' . PHP_EOL;

-		foreach($this->columns as $column)

+		$output_columns = 'array('.PHP_EOL;

+		foreach ($this->columns as $column)

 		{

-			$output_columns .= $column->getExpressionString() . PHP_EOL . ',';

+			$output_columns .= $column->getExpressionString().PHP_EOL.',';

 		}

 		$output_columns = substr($output_columns, 0, -1);

 		$output_columns .= ')';

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

 	{

 		$arguments = array();

-		foreach($this->columns as $column)

+		foreach ($this->columns as $column)

 		{

 			$arguments[] = $column->getArgument();

 		}

classes/xml/xmlquery/tags/condition/ConditionTag.class.php

Braces +8 added lines, -16 removed lines

@@ -78,13 +78,11 @@ 
 		{

 			$this->query = new QueryTag($condition, TRUE);

 			$this->default_column = $this->query->toString();

-		}

-		else if($condition->attrs->var && !strpos($condition->attrs->var, '.'))

+		} else if($condition->attrs->var && !strpos($condition->attrs->var, '.'))

 		{

 			$this->argument = new QueryArgument($condition);

 			$this->argument_name = $this->argument->getArgumentName();

-		}

-		else

+		} else

 		{

 			if(isset($condition->attrs->default))

 			{

@@ -95,13 +93,11 @@ 
 					if(strpos($default_value, "'") !== FALSE)

 					{

 						$default_value = "\"" . $default_value . "\"";

-					}

-					else

+					} else

 					{

 						$default_value = "'" . $default_value . "'";

 					}

-				}

-				else

+				} else

 				{

 					$default_value_object = new DefaultValue($this->column_name, $condition->attrs->default);

 					$default_value = $default_value_object->toString();

@@ -116,16 +112,14 @@ 
 						if(strpos($default_value, "'") !== FALSE)

 						{

 							$default_value = "\"" . $default_value . "\"";

-						}

-						else

+						} else

 						{

 							$default_value = "'" . $default_value . "'";

 						}

 					}

 				}

 				$this->default_column = $default_value;

-			}

-			else

+			} else

 			{

 				$this->default_column = "'" . $dbParser->parseColumnName($condition->attrs->var) . "'";

 			}

@@ -161,8 +155,7 @@ 
 							, '"' . $this->operation . '"'

 							, $this->pipe ? ", '" . $this->pipe . "'" : ''

 			);

-		}

-		else if(isset($this->default_column))

+		} else if(isset($this->default_column))

 		{

 			return sprintf("new ConditionWithoutArgument('%s',%s,%s%s)"

 							, $this->column_name

@@ -170,8 +163,7 @@ 
 							, '"' . $this->operation . '"'

 							, $this->pipe ? ", '" . $this->pipe . "'" : ''

 			);

-		}

-		else

+		} else

 		{

 			return sprintf("new ConditionWithArgument('%s',%s,%s%s)"

 							, $this->column_name

Spacing +27 added lines, -27 removed lines

@@ -67,38 +67,38 @@ 
 		$this->column_name = $dbParser->parseExpression($condition->attrs->column);

 

 		// If default value is column name, it should be escaped

-		if($isColumnName = (strpos($condition->attrs->default, '.') !== FALSE

+		if ($isColumnName = (strpos($condition->attrs->default, '.') !== FALSE

 				&& strpos($condition->attrs->default, '.') !== 0

-				&& strpos($condition->attrs->default, '%') === FALSE ))

+				&& strpos($condition->attrs->default, '%') === FALSE))

 		{

 			$condition->attrs->default = $dbParser->parseExpression($condition->attrs->default);

 		}

 

-		if($condition->node_name == 'query')

+		if ($condition->node_name == 'query')

 		{

 			$this->query = new QueryTag($condition, TRUE);

 			$this->default_column = $this->query->toString();

 		}

-		else if($condition->attrs->var && !strpos($condition->attrs->var, '.'))

+		else if ($condition->attrs->var && !strpos($condition->attrs->var, '.'))

 		{

 			$this->argument = new QueryArgument($condition);

 			$this->argument_name = $this->argument->getArgumentName();

 		}

 		else

 		{

-			if(isset($condition->attrs->default))

+			if (isset($condition->attrs->default))

 			{

 				$operationList = array('in' => 1, 'between' => 1, 'notin' => 1, 'not_in' => 1);

-				if(isset($operationList[$this->operation]))

+				if (isset($operationList[$this->operation]))

 				{

 					$default_value = $condition->attrs->default;

-					if(strpos($default_value, "'") !== FALSE)

+					if (strpos($default_value, "'") !== FALSE)

 					{

-						$default_value = "\"" . $default_value . "\"";

+						$default_value = "\"".$default_value."\"";

 					}

 					else

 					{

-						$default_value = "'" . $default_value . "'";

+						$default_value = "'".$default_value."'";

 					}

 				}

 				else

@@ -106,20 +106,20 @@ 
 					$default_value_object = new DefaultValue($this->column_name, $condition->attrs->default);

 					$default_value = $default_value_object->toString();

 

-					if($default_value_object->isStringFromFunction())

+					if ($default_value_object->isStringFromFunction())

 					{

-						$default_value = '"\'".' . $default_value . '."\'"';

+						$default_value = '"\'".'.$default_value.'."\'"';

 					}

 

-					if($default_value_object->isString() && !$isColumnName && !is_numeric($condition->attrs->default))

+					if ($default_value_object->isString() && !$isColumnName && !is_numeric($condition->attrs->default))

 					{

-						if(strpos($default_value, "'") !== FALSE)

+						if (strpos($default_value, "'") !== FALSE)

 						{

-							$default_value = "\"" . $default_value . "\"";

+							$default_value = "\"".$default_value."\"";

 						}

 						else

 						{

-							$default_value = "'" . $default_value . "'";

+							$default_value = "'".$default_value."'";

 						}

 					}

 				}

@@ -127,7 +127,7 @@ 
 			}

 			else

 			{

-				$this->default_column = "'" . $dbParser->parseColumnName($condition->attrs->var) . "'";

+				$this->default_column = "'".$dbParser->parseColumnName($condition->attrs->var)."'";

 			}

 		}

 	}

@@ -140,11 +140,11 @@ 
 	function getArguments()

 	{

 		$arguments = array();

-		if($this->query)

+		if ($this->query)

 		{

 			$arguments = array_merge($arguments, $this->query->getArguments());

 		}

-		if($this->argument)

+		if ($this->argument)

 		{

 			$arguments[] = $this->argument;

 		}

@@ -153,31 +153,31 @@ 
 

 	function getConditionString()

 	{

-		if($this->query)

+		if ($this->query)

 		{

 			return sprintf("new ConditionSubquery('%s',%s,%s%s)"

 							, $this->column_name

 							, $this->default_column

-							, '"' . $this->operation . '"'

-							, $this->pipe ? ", '" . $this->pipe . "'" : ''

+							, '"'.$this->operation.'"'

+							, $this->pipe ? ", '".$this->pipe."'" : ''

 			);

 		}

-		else if(isset($this->default_column))

+		else if (isset($this->default_column))

 		{

 			return sprintf("new ConditionWithoutArgument('%s',%s,%s%s)"

 							, $this->column_name

 							, $this->default_column

-							, '"' . $this->operation . '"'

-							, $this->pipe ? ", '" . $this->pipe . "'" : ''

+							, '"'.$this->operation.'"'

+							, $this->pipe ? ", '".$this->pipe."'" : ''

 			);

 		}

 		else

 		{

 			return sprintf("new ConditionWithArgument('%s',%s,%s%s)"

 							, $this->column_name

-							, '$' . $this->argument_name . '_argument'

-							, '"' . $this->operation . '"'

-							, $this->pipe ? ", '" . $this->pipe . "'" : ''

+							, '$'.$this->argument_name.'_argument'

+							, '"'.$this->operation.'"'

+							, $this->pipe ? ", '".$this->pipe."'" : ''

 			);

 		}

 	}

classes/xml/xmlquery/tags/navigation/LimitTag.class.php

Spacing +5 added lines, -5 removed lines

@@ -42,11 +42,11 @@ 
 	 */

 	function LimitTag($index)

 	{

-		if($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)

+		if ($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)

 		{

-			if(!isset($index->page->attrs->default))

+			if (!isset($index->page->attrs->default))

 				$index->page->attrs->default = 1;

-			if(!isset($index->page_count->attrs->default))

+			if (!isset($index->page_count->attrs->default))

 				$index->page_count->attrs->default = 10;

 			$this->page = new QueryArgument($index->page);

 			$this->page_count = new QueryArgument($index->page_count);

@@ -54,7 +54,7 @@ 
 			$this->arguments[] = $this->page_count;

 		}

 

-		if(!isset($index->list_count->attrs->default))

+		if (!isset($index->list_count->attrs->default))

 			$index->list_count->attrs->default = 0;

 		$this->list_count = new QueryArgument($index->list_count);

 		$this->arguments[] = $this->list_count;

@@ -62,7 +62,7 @@ 
 

 	function toString()

 	{

-		if($this->page)

+		if ($this->page)

 		{

 			return sprintf('new Limit(${\'%s_argument\'}, ${\'%s_argument\'}, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->page->getArgumentName(), $this->page_count->getArgumentName());

 		}

Braces +10 added lines, -8 removed lines

@@ -44,18 +44,21 @@ 
 	{

 		if($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)

 		{

-			if(!isset($index->page->attrs->default))

-				$index->page->attrs->default = 1;

-			if(!isset($index->page_count->attrs->default))

-				$index->page_count->attrs->default = 10;

+			if(!isset($index->page->attrs->default)) {
+							$index->page->attrs->default = 1;
+			}
+			if(!isset($index->page_count->attrs->default)) {
+							$index->page_count->attrs->default = 10;
+			}
 			$this->page = new QueryArgument($index->page);

 			$this->page_count = new QueryArgument($index->page_count);

 			$this->arguments[] = $this->page;

 			$this->arguments[] = $this->page_count;

 		}

 

-		if(!isset($index->list_count->attrs->default))

-			$index->list_count->attrs->default = 0;

+		if(!isset($index->list_count->attrs->default)) {
+					$index->list_count->attrs->default = 0;
+		}
 		$this->list_count = new QueryArgument($index->list_count);

 		$this->arguments[] = $this->list_count;

 	}

@@ -65,8 +68,7 @@ 
 		if($this->page)

 		{

 			return sprintf('new Limit(${\'%s_argument\'}, ${\'%s_argument\'}, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->page->getArgumentName(), $this->page_count->getArgumentName());

-		}

-		else

+		} else

 		{

 			return sprintf('new Limit(${\'%s_argument\'})', $this->list_count->getArgumentName());

 		}

classes/xml/xmlquery/tags/navigation/NavigationTag.class.php

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
 		if($this->limit)

 		{

 			return $this->limit->toString();

-		}

-		else

+		} else

 		{

 			return "";

 		}

Spacing +14 added lines, -14 removed lines

@@ -49,36 +49,36 @@ 
 	function NavigationTag($xml_navigation)

 	{

 		$this->order = array();

-		if($xml_navigation)

+		if ($xml_navigation)

 		{

 			$order = $xml_navigation->index;

-			if($order)

+			if ($order)

 			{

-				if(!is_array($order))

+				if (!is_array($order))

 				{

 					$order = array($order);

 				}

-				foreach($order as $order_info)

+				foreach ($order as $order_info)

 				{

 					$this->order[] = new IndexTag($order_info);

 				}

 

-				if($xml_navigation->page && $xml_navigation->page->attrs || $xml_navigation->list_count && $xml_navigation->list_count->attrs)

+				if ($xml_navigation->page && $xml_navigation->page->attrs || $xml_navigation->list_count && $xml_navigation->list_count->attrs)

 				{

 					$this->limit = new LimitTag($xml_navigation);

 				}

 

-				if($xml_navigation->list_count)

+				if ($xml_navigation->list_count)

 				{

 					$this->list_count = $xml_navigation->list_count->attrs;

 				}

 

-				if($xml_navigation->page_count)

+				if ($xml_navigation->page_count)

 				{

 					$this->page_count = $xml_navigation->page_count->attrs;

 				}

 

-				if($xml_navigation->page)

+				if ($xml_navigation->page)

 				{

 					$this->page = $xml_navigation->page->attrs;

 				}

@@ -92,10 +92,10 @@ 
 	 */

 	function getOrderByString()

 	{

-		$output = 'array(' . PHP_EOL;

-		foreach($this->order as $order)

+		$output = 'array('.PHP_EOL;

+		foreach ($this->order as $order)

 		{

-			$output .= $order->toString() . PHP_EOL . ',';

+			$output .= $order->toString().PHP_EOL.',';

 		}

 		$output = substr($output, 0, -1);

 		$output .= ')';

@@ -108,7 +108,7 @@ 
 	 */

 	function getLimitString()

 	{

-		if($this->limit)

+		if ($this->limit)

 		{

 			return $this->limit->toString();

 		}

@@ -121,11 +121,11 @@ 
 	function getArguments()

 	{

 		$arguments = array();

-		foreach($this->order as $order)

+		foreach ($this->order as $order)

 		{

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

 		}

-		if($this->limit)

+		if ($this->limit)

 		{

 			$arguments = array_merge($this->limit->getArguments(), $arguments);

 		}

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

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 . ',';

 			}

Spacing +14 added lines, -14 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]);

 				}

@@ -90,16 +90,16 @@ 
 

 	function toString()

 	{

-		$output_tables = 'array(' . PHP_EOL;

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

+		$output_tables = 'array('.PHP_EOL;

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

 		{

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

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

 			{

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

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

 			}

 			else

 			{

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

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

 			}

 		}

 		$output_tables = substr($output_tables, 0, -1);

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

 	{

 		$arguments = array();

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

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

 		{

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

 		}

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';
 

Spacing +37 added lines, -37 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,9 +53,9 @@ 
 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';
+	require _XE_PATH_.'config/package.inc.php';
 }
 else
 {
@@ -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';
+	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
@@ -270,7 +270,7 @@ 
 	define('__PROXY_SERVER__', NULL);
 }
 
-if(!defined('__ERROR_LOG__'))
+if (!defined('__ERROR_LOG__'))
 {
 	/**
 	 * __ERROR_LOG__ 는 PHP의 에러로그를 출력하는 기능입니다. 개발시 워닝에러이상의 에러부터 잡기 시작합니다.
@@ -282,25 +282,25 @@ 
 }
 
 // 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';
+	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());
 }
 
 // Require a function-defined-file for simple use
-require(_XE_PATH_ . 'config/func.inc.php');
+require(_XE_PATH_.'config/func.inc.php');
 
-if(__DEBUG__) {
+if (__DEBUG__) {
 	define('__StartTime__', getMicroTime());
 }
 
-if(__DEBUG__) {
+if (__DEBUG__) {
 	$GLOBALS['__elapsed_class_load__'] = 0;
 }
 
@@ -402,38 +402,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)];
+		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';
+		$candidate_filename[] = 'modules/'.$matches[1].'/'.$matches[1];
+		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;
+			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 */

index.php

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());

Spacing +5 added lines, -5 removed lines

@@ -32,11 +32,11 @@ 
 /**
  * @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
  **/
-require dirname(__FILE__) . '/config/config.inc.php';
+require dirname(__FILE__).'/config/config.inc.php';
 
 /**
  * @brief Initialize by creating Context object
@@ -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());

libs/PEAR.1.9.5/HTTP/Request2.php

Indentation +977 added lines, -977 removed lines

@@ -41,990 +41,990 @@
  */

 class HTTP_Request2 implements SplSubject

 {

-    /**#@+

+	/**#@+

      * Constants for HTTP request methods

      *

      * @link http://tools.ietf.org/html/rfc2616#section-5.1.1

      */

-    const METHOD_OPTIONS = 'OPTIONS';

-    const METHOD_GET     = 'GET';

-    const METHOD_HEAD    = 'HEAD';

-    const METHOD_POST    = 'POST';

-    const METHOD_PUT     = 'PUT';

-    const METHOD_DELETE  = 'DELETE';

-    const METHOD_TRACE   = 'TRACE';

-    const METHOD_CONNECT = 'CONNECT';

-    /**#@-*/

-

-    /**#@+

+	const METHOD_OPTIONS = 'OPTIONS';

+	const METHOD_GET     = 'GET';

+	const METHOD_HEAD    = 'HEAD';

+	const METHOD_POST    = 'POST';

+	const METHOD_PUT     = 'PUT';

+	const METHOD_DELETE  = 'DELETE';

+	const METHOD_TRACE   = 'TRACE';

+	const METHOD_CONNECT = 'CONNECT';

+	/**#@-*/

+

+	/**#@+

      * Constants for HTTP authentication schemes

      *

      * @link http://tools.ietf.org/html/rfc2617

      */

-    const AUTH_BASIC  = 'basic';

-    const AUTH_DIGEST = 'digest';

-    /**#@-*/

-

-    /**

-     * Regular expression used to check for invalid symbols in RFC 2616 tokens

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

-     */

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

-

-    /**

-     * Regular expression used to check for invalid symbols in cookie strings

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

-     * @link http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html

-     */

-    const REGEXP_INVALID_COOKIE = '/[\s,;]/';

-

-    /**

-     * Fileinfo magic database resource

-     * @var  resource

-     * @see  detectMimeType()

-     */

-    private static $_fileinfoDb;

-

-    /**

-     * Observers attached to the request (instances of SplObserver)

-     * @var  array

-     */

-    protected $observers = array();

-

-    /**

-     * Request URL

-     * @var  Net_URL2

-     */

-    protected $url;

-

-    /**

-     * Request method

-     * @var  string

-     */

-    protected $method = self::METHOD_GET;

-

-    /**

-     * Authentication data

-     * @var  array

-     * @see  getAuth()

-     */

-    protected $auth;

-

-    /**

-     * Request headers

-     * @var  array

-     */

-    protected $headers = array();

-

-    /**

-     * Configuration parameters

-     * @var  array

-     * @see  setConfig()

-     */

-    protected $config = array(

-        'adapter'           => 'HTTP_Request2_Adapter_Socket',

-        'connect_timeout'   => 10,

-        'timeout'           => 0,

-        'use_brackets'      => true,

-        'protocol_version'  => '1.1',

-        'buffer_size'       => 16384,

-        'store_body'        => true,

-        'local_ip'          => null,

-

-        'proxy_host'        => '',

-        'proxy_port'        => '',

-        'proxy_user'        => '',

-        'proxy_password'    => '',

-        'proxy_auth_scheme' => self::AUTH_BASIC,

-        'proxy_type'        => 'http',

-

-        'ssl_verify_peer'   => true,

-        'ssl_verify_host'   => true,

-        'ssl_cafile'        => null,

-        'ssl_capath'        => null,

-        'ssl_local_cert'    => null,

-        'ssl_passphrase'    => null,

-

-        'digest_compat_ie'  => false,

-

-        'follow_redirects'  => false,

-        'max_redirects'     => 5,

-        'strict_redirects'  => false

-    );

-

-    /**

-     * Last event in request / response handling, intended for observers

-     * @var  array

-     * @see  getLastEvent()

-     */

-    protected $lastEvent = array(

-        'name' => 'start',

-        'data' => null

-    );

-

-    /**

-     * Request body

-     * @var  string|resource

-     * @see  setBody()

-     */

-    protected $body = '';

-

-    /**

-     * Array of POST parameters

-     * @var  array

-     */

-    protected $postParams = array();

-

-    /**

-     * Array of file uploads (for multipart/form-data POST requests)

-     * @var  array

-     */

-    protected $uploads = array();

-

-    /**

-     * Adapter used to perform actual HTTP request

-     * @var  HTTP_Request2_Adapter

-     */

-    protected $adapter;

-

-    /**

-     * Cookie jar to persist cookies between requests

-     * @var HTTP_Request2_CookieJar

-     */

-    protected $cookieJar = null;

-

-    /**

-     * Constructor. Can set request URL, method and configuration array.

-     *

-     * Also sets a default value for User-Agent header.

-     *

-     * @param string|Net_Url2 $url    Request URL

-     * @param string          $method Request method

-     * @param array           $config Configuration for this Request instance

-     */

-    public function __construct(

-        $url = null, $method = self::METHOD_GET, array $config = array()

-    ) {

-        $this->setConfig($config);

-        if (!empty($url)) {

-            $this->setUrl($url);

-        }

-        if (!empty($method)) {

-            $this->setMethod($method);

-        }

-        $this->setHeader(

-            'user-agent', 'HTTP_Request2/2.2.1 ' .

-            '(http://pear.php.net/package/http_request2) PHP/' . phpversion()

-        );

-    }

-

-    /**

-     * Sets the URL for this request

-     *

-     * If the URL has userinfo part (username & password) these will be removed

-     * and converted to auth data. If the URL does not have a path component,

-     * that will be set to '/'.

-     *

-     * @param string|Net_URL2 $url Request URL

-     *

-     * @return   HTTP_Request2

-     * @throws   HTTP_Request2_LogicException

-     */

-    public function setUrl($url)

-    {

-        if (is_string($url)) {

-            $url = new Net_URL2(

-                $url, array(Net_URL2::OPTION_USE_BRACKETS => $this->config['use_brackets'])

-            );

-        }

-        if (!$url instanceof Net_URL2) {

-            throw new HTTP_Request2_LogicException(

-                'Parameter is not a valid HTTP URL',

-                HTTP_Request2_Exception::INVALID_ARGUMENT

-            );

-        }

-        // URL contains username / password?

-        if ($url->getUserinfo()) {

-            $username = $url->getUser();

-            $password = $url->getPassword();

-            $this->setAuth(rawurldecode($username), $password? rawurldecode($password): '');

-            $url->setUserinfo('');

-        }

-        if ('' == $url->getPath()) {

-            $url->setPath('/');

-        }

-        $this->url = $url;

-

-        return $this;

-    }

-

-    /**

-     * Returns the request URL

-     *

-     * @return   Net_URL2

-     */

-    public function getUrl()

-    {

-        return $this->url;

-    }

-

-    /**

-     * Sets the request method

-     *

-     * @param string $method one of the methods defined in RFC 2616

-     *

-     * @return   HTTP_Request2

-     * @throws   HTTP_Request2_LogicException if the method name is invalid

-     */

-    public function setMethod($method)

-    {

-        // Method name should be a token: http://tools.ietf.org/html/rfc2616#section-5.1.1

-        if (preg_match(self::REGEXP_INVALID_TOKEN, $method)) {

-            throw new HTTP_Request2_LogicException(

-                "Invalid request method '{$method}'",

-                HTTP_Request2_Exception::INVALID_ARGUMENT

-            );

-        }

-        $this->method = $method;

-

-        return $this;

-    }

-

-    /**

-     * Returns the request method

-     *

-     * @return   string

-     */

-    public function getMethod()

-    {

-        return $this->method;

-    }

-

-    /**

-     * Sets the configuration parameter(s)

-     *

-     * The following parameters are available:

-     * <ul>

-     *   <li> 'adapter'           - adapter to use (string)</li>

-     *   <li> 'connect_timeout'   - Connection timeout in seconds (integer)</li>

-     *   <li> 'timeout'           - Total number of seconds a request can take.

-     *                              Use 0 for no limit, should be greater than

-     *                              'connect_timeout' if set (integer)</li>

-     *   <li> 'use_brackets'      - Whether to append [] to array variable names (bool)</li>

-     *   <li> 'protocol_version'  - HTTP Version to use, '1.0' or '1.1' (string)</li>

-     *   <li> 'buffer_size'       - Buffer size to use for reading and writing (int)</li>

-     *   <li> 'store_body'        - Whether to store response body in response object.

-     *                              Set to false if receiving a huge response and

-     *                              using an Observer to save it (boolean)</li>

-     *   <li> 'local_ip'          - Specifies the IP address that will be used for accessing

-     *                              the network (string)</li>

-     *   <li> 'proxy_type'        - Proxy type, 'http' or 'socks5' (string)</li>

-     *   <li> 'proxy_host'        - Proxy server host (string)</li>

-     *   <li> 'proxy_port'        - Proxy server port (integer)</li>

-     *   <li> 'proxy_user'        - Proxy auth username (string)</li>

-     *   <li> 'proxy_password'    - Proxy auth password (string)</li>

-     *   <li> 'proxy_auth_scheme' - Proxy auth scheme, one of HTTP_Request2::AUTH_* constants (string)</li>

-     *   <li> 'proxy'             - Shorthand for proxy_* parameters, proxy given as URL,

-     *                              e.g. 'socks5://localhost:1080/' (string)</li>

-     *   <li> 'ssl_verify_peer'   - Whether to verify peer's SSL certificate (bool)</li>

-     *   <li> 'ssl_verify_host'   - Whether to check that Common Name in SSL

-     *                              certificate matches host name (bool)</li>

-     *   <li> 'ssl_cafile'        - Cerificate Authority file to verify the peer

-     *                              with (use with 'ssl_verify_peer') (string)</li>

-     *   <li> 'ssl_capath'        - Directory holding multiple Certificate

-     *                              Authority files (string)</li>

-     *   <li> 'ssl_local_cert'    - Name of a file containing local cerificate (string)</li>

-     *   <li> 'ssl_passphrase'    - Passphrase with which local certificate

-     *                              was encoded (string)</li>

-     *   <li> 'digest_compat_ie'  - Whether to imitate behaviour of MSIE 5 and 6

-     *                              in using URL without query string in digest

-     *                              authentication (boolean)</li>

-     *   <li> 'follow_redirects'  - Whether to automatically follow HTTP Redirects (boolean)</li>

-     *   <li> 'max_redirects'     - Maximum number of redirects to follow (integer)</li>

-     *   <li> 'strict_redirects'  - Whether to keep request method on redirects via status 301 and

-     *                              302 (true, needed for compatibility with RFC 2616)

-     *                              or switch to GET (false, needed for compatibility with most

-     *                              browsers) (boolean)</li>

-     * </ul>

-     *

-     * @param string|array $nameOrConfig configuration parameter name or array

-     *                                   ('parameter name' => 'parameter value')

-     * @param mixed        $value        parameter value if $nameOrConfig is not an array

-     *

-     * @return   HTTP_Request2

-     * @throws   HTTP_Request2_LogicException If the parameter is unknown

-     */

-    public function setConfig($nameOrConfig, $value = null)

-    {

-        if (is_array($nameOrConfig)) {

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

-                $this->setConfig($name, $value);

-            }

-

-        } elseif ('proxy' == $nameOrConfig) {

-            $url = new Net_URL2($value);

-            $this->setConfig(array(

-                'proxy_type'     => $url->getScheme(),

-                'proxy_host'     => $url->getHost(),

-                'proxy_port'     => $url->getPort(),

-                'proxy_user'     => rawurldecode($url->getUser()),

-                'proxy_password' => rawurldecode($url->getPassword())

-            ));

-

-        } else {

-            if (!array_key_exists($nameOrConfig, $this->config)) {

-                throw new HTTP_Request2_LogicException(

-                    "Unknown configuration parameter '{$nameOrConfig}'",

-                    HTTP_Request2_Exception::INVALID_ARGUMENT

-                );

-            }

-            $this->config[$nameOrConfig] = $value;

-        }

-

-        return $this;

-    }

-

-    /**

-     * Returns the value(s) of the configuration parameter(s)

-     *

-     * @param string $name parameter name

-     *

-     * @return   mixed   value of $name parameter, array of all configuration

-     *                   parameters if $name is not given

-     * @throws   HTTP_Request2_LogicException If the parameter is unknown

-     */

-    public function getConfig($name = null)

-    {

-        if (null === $name) {

-            return $this->config;

-        } elseif (!array_key_exists($name, $this->config)) {

-            throw new HTTP_Request2_LogicException(

-                "Unknown configuration parameter '{$name}'",

-                HTTP_Request2_Exception::INVALID_ARGUMENT

-            );

-        }

-        return $this->config[$name];

-    }

-

-    /**

-     * Sets the autentification data

-     *

-     * @param string $user     user name

-     * @param string $password password

-     * @param string $scheme   authentication scheme

-     *

-     * @return   HTTP_Request2

-     */

-    public function setAuth($user, $password = '', $scheme = self::AUTH_BASIC)

-    {

-        if (empty($user)) {

-            $this->auth = null;

-        } else {

-            $this->auth = array(

-                'user'     => (string)$user,

-                'password' => (string)$password,

-                'scheme'   => $scheme

-            );

-        }

-

-        return $this;

-    }

-

-    /**

-     * Returns the authentication data

-     *

-     * The array has the keys 'user', 'password' and 'scheme', where 'scheme'

-     * is one of the HTTP_Request2::AUTH_* constants.

-     *

-     * @return   array

-     */

-    public function getAuth()

-    {

-        return $this->auth;

-    }

-

-    /**

-     * Sets request header(s)

-     *

-     * The first parameter may be either a full header string 'header: value' or

-     * header name. In the former case $value parameter is ignored, in the latter

-     * the header's value will either be set to $value or the header will be

-     * removed if $value is null. The first parameter can also be an array of

-     * headers, in that case method will be called recursively.

-     *

-     * Note that headers are treated case insensitively as per RFC 2616.

-     *

-     * <code>

-     * $req->setHeader('Foo: Bar'); // sets the value of 'Foo' header to 'Bar'

-     * $req->setHeader('FoO', 'Baz'); // sets the value of 'Foo' header to 'Baz'

-     * $req->setHeader(array('foo' => 'Quux')); // sets the value of 'Foo' header to 'Quux'

-     * $req->setHeader('FOO'); // removes 'Foo' header from request

-     * </code>

-     *

-     * @param string|array      $name    header name, header string ('Header: value')

-     *                                   or an array of headers

-     * @param string|array|null $value   header value if $name is not an array,

-     *                                   header will be removed if value is null

-     * @param bool              $replace whether to replace previous header with the

-     *                                   same name or append to its value

-     *

-     * @return   HTTP_Request2

-     * @throws   HTTP_Request2_LogicException

-     */

-    public function setHeader($name, $value = null, $replace = true)

-    {

-        if (is_array($name)) {

-            foreach ($name as $k => $v) {

-                if (is_string($k)) {

-                    $this->setHeader($k, $v, $replace);

-                } else {

-                    $this->setHeader($v, null, $replace);

-                }

-            }

-        } else {

-            if (null === $value && strpos($name, ':')) {

-                list($name, $value) = array_map('trim', explode(':', $name, 2));

-            }

-            // Header name should be a token: http://tools.ietf.org/html/rfc2616#section-4.2

-            if (preg_match(self::REGEXP_INVALID_TOKEN, $name)) {

-                throw new HTTP_Request2_LogicException(

-                    "Invalid header name '{$name}'",

-                    HTTP_Request2_Exception::INVALID_ARGUMENT

-                );

-            }

-            // Header names are case insensitive anyway

-            $name = strtolower($name);

-            if (null === $value) {

-                unset($this->headers[$name]);

-

-            } else {

-                if (is_array($value)) {

-                    $value = implode(', ', array_map('trim', $value));

-                } elseif (is_string($value)) {

-                    $value = trim($value);

-                }

-                if (!isset($this->headers[$name]) || $replace) {

-                    $this->headers[$name] = $value;

-                } else {

-                    $this->headers[$name] .= ', ' . $value;

-                }

-            }

-        }

-

-        return $this;

-    }

-

-    /**

-     * Returns the request headers

-     *

-     * The array is of the form ('header name' => 'header value'), header names

-     * are lowercased

-     *

-     * @return   array

-     */

-    public function getHeaders()

-    {

-        return $this->headers;

-    }

-

-    /**

-     * Adds a cookie to the request

-     *

-     * If the request does not have a CookieJar object set, this method simply

-     * appends a cookie to "Cookie:" header.

-     *

-     * If a CookieJar object is available, the cookie is stored in that object.

-     * Data from request URL will be used for setting its 'domain' and 'path'

-     * parameters, 'expires' and 'secure' will be set to null and false,

-     * respectively. If you need further control, use CookieJar's methods.

-     *

-     * @param string $name  cookie name

-     * @param string $value cookie value

-     *

-     * @return   HTTP_Request2

-     * @throws   HTTP_Request2_LogicException

-     * @see      setCookieJar()

-     */

-    public function addCookie($name, $value)

-    {

-        if (!empty($this->cookieJar)) {

-            $this->cookieJar->store(

-                array('name' => $name, 'value' => $value), $this->url

-            );

-

-        } else {

-            $cookie = $name . '=' . $value;

-            if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {

-                throw new HTTP_Request2_LogicException(

-                    "Invalid cookie: '{$cookie}'",

-                    HTTP_Request2_Exception::INVALID_ARGUMENT

-                );

-            }

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

-            $this->setHeader('cookie', $cookies . $cookie);

-        }

-

-        return $this;

-    }

-

-    /**

-     * Sets the request body

-     *

-     * If you provide file pointer rather than file name, it should support

-     * fstat() and rewind() operations.

-     *

-     * @param string|resource|HTTP_Request2_MultipartBody $body       Either a

-     *               string with the body or filename containing body or

-     *               pointer to an open file or object with multipart body data

-     * @param bool                                        $isFilename Whether

-     *               first parameter is a filename

-     *

-     * @return   HTTP_Request2

-     * @throws   HTTP_Request2_LogicException

-     */

-    public function setBody($body, $isFilename = false)

-    {

-        if (!$isFilename && !is_resource($body)) {

-            if (!$body instanceof HTTP_Request2_MultipartBody) {

-                $this->body = (string)$body;

-            } else {

-                $this->body = $body;

-            }

-        } else {

-            $fileData = $this->fopenWrapper($body, empty($this->headers['content-type']));

-            $this->body = $fileData['fp'];

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

-                $this->setHeader('content-type', $fileData['type']);

-            }

-        }

-        $this->postParams = $this->uploads = array();

-

-        return $this;

-    }

-

-    /**

-     * Returns the request body

-     *

-     * @return   string|resource|HTTP_Request2_MultipartBody

-     */

-    public function getBody()

-    {

-        if (self::METHOD_POST == $this->method

-            && (!empty($this->postParams) || !empty($this->uploads))

-        ) {

-            if (0 === strpos($this->headers['content-type'], 'application/x-www-form-urlencoded')) {

-                $body = http_build_query($this->postParams, '', '&');

-                if (!$this->getConfig('use_brackets')) {

-                    $body = preg_replace('/%5B\d+%5D=/', '=', $body);

-                }

-                // support RFC 3986 by not encoding '~' symbol (request #15368)

-                return str_replace('%7E', '~', $body);

-

-            } elseif (0 === strpos($this->headers['content-type'], 'multipart/form-data')) {

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

-                return new HTTP_Request2_MultipartBody(

-                    $this->postParams, $this->uploads, $this->getConfig('use_brackets')

-                );

-            }

-        }

-        return $this->body;

-    }

-

-    /**

-     * Adds a file to form-based file upload

-     *

-     * Used to emulate file upload via a HTML form. The method also sets

-     * Content-Type of HTTP request to 'multipart/form-data'.

-     *

-     * If you just want to send the contents of a file as the body of HTTP

-     * request you should use setBody() method.

-     *

-     * If you provide file pointers rather than file names, they should support

-     * fstat() and rewind() operations.

-     *

-     * @param string                $fieldName    name of file-upload field

-     * @param string|resource|array $filename     full name of local file,

-     *               pointer to open file or an array of files

-     * @param string                $sendFilename filename to send in the request

-     * @param string                $contentType  content-type of file being uploaded

-     *

-     * @return   HTTP_Request2

-     * @throws   HTTP_Request2_LogicException

-     */

-    public function addUpload(

-        $fieldName, $filename, $sendFilename = null, $contentType = null

-    ) {

-        if (!is_array($filename)) {

-            $fileData = $this->fopenWrapper($filename, empty($contentType));

-            $this->uploads[$fieldName] = array(

-                'fp'        => $fileData['fp'],

-                'filename'  => !empty($sendFilename)? $sendFilename

-                                :(is_string($filename)? basename($filename): 'anonymous.blob') ,

-                'size'      => $fileData['size'],

-                'type'      => empty($contentType)? $fileData['type']: $contentType

-            );

-        } else {

-            $fps = $names = $sizes = $types = array();

-            foreach ($filename as $f) {

-                if (!is_array($f)) {

-                    $f = array($f);

-                }

-                $fileData = $this->fopenWrapper($f[0], empty($f[2]));

-                $fps[]   = $fileData['fp'];

-                $names[] = !empty($f[1])? $f[1]

-                            :(is_string($f[0])? basename($f[0]): 'anonymous.blob');

-                $sizes[] = $fileData['size'];

-                $types[] = empty($f[2])? $fileData['type']: $f[2];

-            }

-            $this->uploads[$fieldName] = array(

-                'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types

-            );

-        }

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

-            || 'application/x-www-form-urlencoded' == $this->headers['content-type']

-        ) {

-            $this->setHeader('content-type', 'multipart/form-data');

-        }

-

-        return $this;

-    }

-

-    /**

-     * Adds POST parameter(s) to the request.

-     *

-     * @param string|array $name  parameter name or array ('name' => 'value')

-     * @param mixed        $value parameter value (can be an array)

-     *

-     * @return   HTTP_Request2

-     */

-    public function addPostParameter($name, $value = null)

-    {

-        if (!is_array($name)) {

-            $this->postParams[$name] = $value;

-        } else {

-            foreach ($name as $k => $v) {

-                $this->addPostParameter($k, $v);

-            }

-        }

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

-            $this->setHeader('content-type', 'application/x-www-form-urlencoded');

-        }

-

-        return $this;

-    }

-

-    /**

-     * Attaches a new observer

-     *

-     * @param SplObserver $observer any object implementing SplObserver

-     */

-    public function attach(SplObserver $observer)

-    {

-        foreach ($this->observers as $attached) {

-            if ($attached === $observer) {

-                return;

-            }

-        }

-        $this->observers[] = $observer;

-    }

-

-    /**

-     * Detaches an existing observer

-     *

-     * @param SplObserver $observer any object implementing SplObserver

-     */

-    public function detach(SplObserver $observer)

-    {

-        foreach ($this->observers as $key => $attached) {

-            if ($attached === $observer) {

-                unset($this->observers[$key]);

-                return;

-            }

-        }

-    }

-

-    /**

-     * Notifies all observers

-     */

-    public function notify()

-    {

-        foreach ($this->observers as $observer) {

-            $observer->update($this);

-        }

-    }

-

-    /**

-     * Sets the last event

-     *

-     * Adapters should use this method to set the current state of the request

-     * and notify the observers.

-     *

-     * @param string $name event name

-     * @param mixed  $data event data

-     */

-    public function setLastEvent($name, $data = null)

-    {

-        $this->lastEvent = array(

-            'name' => $name,

-            'data' => $data

-        );

-        $this->notify();

-    }

-

-    /**

-     * Returns the last event

-     *

-     * Observers should use this method to access the last change in request.

-     * The following event names are possible:

-     * <ul>

-     *   <li>'connect'                 - after connection to remote server,

-     *                                   data is the destination (string)</li>

-     *   <li>'disconnect'              - after disconnection from server</li>

-     *   <li>'sentHeaders'             - after sending the request headers,

-     *                                   data is the headers sent (string)</li>

-     *   <li>'sentBodyPart'            - after sending a part of the request body,

-     *                                   data is the length of that part (int)</li>

-     *   <li>'sentBody'                - after sending the whole request body,

-     *                                   data is request body length (int)</li>

-     *   <li>'receivedHeaders'         - after receiving the response headers,

-     *                                   data is HTTP_Request2_Response object</li>

-     *   <li>'receivedBodyPart'        - after receiving a part of the response

-     *                                   body, data is that part (string)</li>

-     *   <li>'receivedEncodedBodyPart' - as 'receivedBodyPart', but data is still

-     *                                   encoded by Content-Encoding</li>

-     *   <li>'receivedBody'            - after receiving the complete response

-     *                                   body, data is HTTP_Request2_Response object</li>

-     * </ul>

-     * Different adapters may not send all the event types. Mock adapter does

-     * not send any events to the observers.

-     *

-     * @return   array   The array has two keys: 'name' and 'data'

-     */

-    public function getLastEvent()

-    {

-        return $this->lastEvent;

-    }

-

-    /**

-     * Sets the adapter used to actually perform the request

-     *

-     * You can pass either an instance of a class implementing HTTP_Request2_Adapter

-     * or a class name. The method will only try to include a file if the class

-     * name starts with HTTP_Request2_Adapter_, it will also try to prepend this

-     * prefix to the class name if it doesn't contain any underscores, so that

-     * <code>

-     * $request->setAdapter('curl');

-     * </code>

-     * will work.

-     *

-     * @param string|HTTP_Request2_Adapter $adapter Adapter to use

-     *

-     * @return   HTTP_Request2

-     * @throws   HTTP_Request2_LogicException

-     */

-    public function setAdapter($adapter)

-    {

-        if (is_string($adapter)) {

-            if (!class_exists($adapter, false)) {

-                if (false === strpos($adapter, '_')) {

-                    $adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);

-                }

-                if (!class_exists($adapter, false)

-                    && preg_match('/^HTTP_Request2_Adapter_([a-zA-Z0-9]+)$/', $adapter)

-                ) {

-                    include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';

-                }

-                if (!class_exists($adapter, false)) {

-                    throw new HTTP_Request2_LogicException(

-                        "Class {$adapter} not found",

-                        HTTP_Request2_Exception::MISSING_VALUE

-                    );

-                }

-            }

-            $adapter = new $adapter;

-        }

-        if (!$adapter instanceof HTTP_Request2_Adapter) {

-            throw new HTTP_Request2_LogicException(

-                'Parameter is not a HTTP request adapter',

-                HTTP_Request2_Exception::INVALID_ARGUMENT

-            );

-        }

-        $this->adapter = $adapter;

-

-        return $this;

-    }

-

-    /**

-     * Sets the cookie jar

-     *

-     * A cookie jar is used to maintain cookies across HTTP requests and

-     * responses. Cookies from jar will be automatically added to the request

-     * headers based on request URL.

-     *

-     * @param HTTP_Request2_CookieJar|bool $jar Existing CookieJar object, true to

-     *                                          create a new one, false to remove

-     *

-     * @return HTTP_Request2

-     * @throws HTTP_Request2_LogicException

-     */

-    public function setCookieJar($jar = true)

-    {

-        if (!class_exists('HTTP_Request2_CookieJar', false)) {

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

-        }

-

-        if ($jar instanceof HTTP_Request2_CookieJar) {

-            $this->cookieJar = $jar;

-        } elseif (true === $jar) {

-            $this->cookieJar = new HTTP_Request2_CookieJar();

-        } elseif (!$jar) {

-            $this->cookieJar = null;

-        } else {

-            throw new HTTP_Request2_LogicException(

-                'Invalid parameter passed to setCookieJar()',

-                HTTP_Request2_Exception::INVALID_ARGUMENT

-            );

-        }

-

-        return $this;

-    }

-

-    /**

-     * Returns current CookieJar object or null if none

-     *

-     * @return HTTP_Request2_CookieJar|null

-     */

-    public function getCookieJar()

-    {

-        return $this->cookieJar;

-    }

-

-    /**

-     * Sends the request and returns the response

-     *

-     * @throws   HTTP_Request2_Exception

-     * @return   HTTP_Request2_Response

-     */

-    public function send()

-    {

-        // Sanity check for URL

-        if (!$this->url instanceof Net_URL2

-            || !$this->url->isAbsolute()

-            || !in_array(strtolower($this->url->getScheme()), array('https', 'http'))

-        ) {

-            throw new HTTP_Request2_LogicException(

-                'HTTP_Request2 needs an absolute HTTP(S) request URL, '

-                . ($this->url instanceof Net_URL2

-                   ? "'" . $this->url->__toString() . "'" : 'none')

-                . ' given',

-                HTTP_Request2_Exception::INVALID_ARGUMENT

-            );

-        }

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

-            $this->setAdapter($this->getConfig('adapter'));

-        }

-        // magic_quotes_runtime may break file uploads and chunked response

-        // processing; see bug #4543. Don't use ini_get() here; see bug #16440.

-        if ($magicQuotes = get_magic_quotes_runtime()) {

-            set_magic_quotes_runtime(false);

-        }

-        // force using single byte encoding if mbstring extension overloads

-        // strlen() and substr(); see bug #1781, bug #10605

-        if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {

-            $oldEncoding = mb_internal_encoding();

-            mb_internal_encoding('8bit');

-        }

-

-        try {

-            $response = $this->adapter->sendRequest($this);

-        } catch (Exception $e) {

-        }

-        // cleanup in either case (poor man's "finally" clause)

-        if ($magicQuotes) {

-            set_magic_quotes_runtime(true);

-        }

-        if (!empty($oldEncoding)) {

-            mb_internal_encoding($oldEncoding);

-        }

-        // rethrow the exception

-        if (!empty($e)) {

-            throw $e;

-        }

-        return $response;

-    }

-

-    /**

-     * Wrapper around fopen()/fstat() used by setBody() and addUpload()

-     *

-     * @param string|resource $file       file name or pointer to open file

-     * @param bool            $detectType whether to try autodetecting MIME

-     *                        type of file, will only work if $file is a

-     *                        filename, not pointer

-     *

-     * @return array array('fp' => file pointer, 'size' => file size, 'type' => MIME type)

-     * @throws HTTP_Request2_LogicException

-     */

-    protected function fopenWrapper($file, $detectType = false)

-    {

-        if (!is_string($file) && !is_resource($file)) {

-            throw new HTTP_Request2_LogicException(

-                "Filename or file pointer resource expected",

-                HTTP_Request2_Exception::INVALID_ARGUMENT

-            );

-        }

-        $fileData = array(

-            'fp'   => is_string($file)? null: $file,

-            'type' => 'application/octet-stream',

-            'size' => 0

-        );

-        if (is_string($file)) {

-            if (!($fileData['fp'] = @fopen($file, 'rb'))) {

-                $error = error_get_last();

-                throw new HTTP_Request2_LogicException(

-                    $error['message'], HTTP_Request2_Exception::READ_ERROR

-                );

-            }

-            if ($detectType) {

-                $fileData['type'] = self::detectMimeType($file);

-            }

-        }

-        if (!($stat = fstat($fileData['fp']))) {

-            throw new HTTP_Request2_LogicException(

-                "fstat() call failed", HTTP_Request2_Exception::READ_ERROR

-            );

-        }

-        $fileData['size'] = $stat['size'];

-

-        return $fileData;

-    }

-

-    /**

-     * Tries to detect MIME type of a file

-     *

-     * The method will try to use fileinfo extension if it is available,

-     * deprecated mime_content_type() function in the other case. If neither

-     * works, default 'application/octet-stream' MIME type is returned

-     *

-     * @param string $filename file name

-     *

-     * @return   string  file MIME type

-     */

-    protected static function detectMimeType($filename)

-    {

-        // finfo extension from PECL available

-        if (function_exists('finfo_open')) {

-            if (!isset(self::$_fileinfoDb)) {

-                self::$_fileinfoDb = @finfo_open(FILEINFO_MIME);

-            }

-            if (self::$_fileinfoDb) {

-                $info = finfo_file(self::$_fileinfoDb, $filename);

-            }

-        }

-        // (deprecated) mime_content_type function available

-        if (empty($info) && function_exists('mime_content_type')) {

-            return mime_content_type($filename);

-        }

-        return empty($info)? 'application/octet-stream': $info;

-    }

+	const AUTH_BASIC  = 'basic';

+	const AUTH_DIGEST = 'digest';

+	/**#@-*/

+

+	/**

+	 * Regular expression used to check for invalid symbols in RFC 2616 tokens

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

+	 */

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

+

+	/**

+	 * Regular expression used to check for invalid symbols in cookie strings

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

+	 * @link http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html

+	 */

+	const REGEXP_INVALID_COOKIE = '/[\s,;]/';

+

+	/**

+	 * Fileinfo magic database resource

+	 * @var  resource

+	 * @see  detectMimeType()

+	 */

+	private static $_fileinfoDb;

+

+	/**

+	 * Observers attached to the request (instances of SplObserver)

+	 * @var  array

+	 */

+	protected $observers = array();

+

+	/**

+	 * Request URL

+	 * @var  Net_URL2

+	 */

+	protected $url;

+

+	/**

+	 * Request method

+	 * @var  string

+	 */

+	protected $method = self::METHOD_GET;

+

+	/**

+	 * Authentication data

+	 * @var  array

+	 * @see  getAuth()

+	 */

+	protected $auth;

+

+	/**

+	 * Request headers

+	 * @var  array

+	 */

+	protected $headers = array();

+

+	/**

+	 * Configuration parameters

+	 * @var  array

+	 * @see  setConfig()

+	 */

+	protected $config = array(

+		'adapter'           => 'HTTP_Request2_Adapter_Socket',

+		'connect_timeout'   => 10,

+		'timeout'           => 0,

+		'use_brackets'      => true,

+		'protocol_version'  => '1.1',

+		'buffer_size'       => 16384,

+		'store_body'        => true,

+		'local_ip'          => null,

+

+		'proxy_host'        => '',

+		'proxy_port'        => '',

+		'proxy_user'        => '',

+		'proxy_password'    => '',

+		'proxy_auth_scheme' => self::AUTH_BASIC,

+		'proxy_type'        => 'http',

+

+		'ssl_verify_peer'   => true,

+		'ssl_verify_host'   => true,

+		'ssl_cafile'        => null,

+		'ssl_capath'        => null,

+		'ssl_local_cert'    => null,

+		'ssl_passphrase'    => null,

+

+		'digest_compat_ie'  => false,

+

+		'follow_redirects'  => false,

+		'max_redirects'     => 5,

+		'strict_redirects'  => false

+	);

+

+	/**

+	 * Last event in request / response handling, intended for observers

+	 * @var  array

+	 * @see  getLastEvent()

+	 */

+	protected $lastEvent = array(

+		'name' => 'start',

+		'data' => null

+	);

+

+	/**

+	 * Request body

+	 * @var  string|resource

+	 * @see  setBody()

+	 */

+	protected $body = '';

+

+	/**

+	 * Array of POST parameters

+	 * @var  array

+	 */

+	protected $postParams = array();

+

+	/**

+	 * Array of file uploads (for multipart/form-data POST requests)

+	 * @var  array

+	 */

+	protected $uploads = array();

+

+	/**

+	 * Adapter used to perform actual HTTP request

+	 * @var  HTTP_Request2_Adapter

+	 */

+	protected $adapter;

+

+	/**

+	 * Cookie jar to persist cookies between requests

+	 * @var HTTP_Request2_CookieJar

+	 */

+	protected $cookieJar = null;

+

+	/**

+	 * Constructor. Can set request URL, method and configuration array.

+	 *

+	 * Also sets a default value for User-Agent header.

+	 *

+	 * @param string|Net_Url2 $url    Request URL

+	 * @param string          $method Request method

+	 * @param array           $config Configuration for this Request instance

+	 */

+	public function __construct(

+		$url = null, $method = self::METHOD_GET, array $config = array()

+	) {

+		$this->setConfig($config);

+		if (!empty($url)) {

+			$this->setUrl($url);

+		}

+		if (!empty($method)) {

+			$this->setMethod($method);

+		}

+		$this->setHeader(

+			'user-agent', 'HTTP_Request2/2.2.1 ' .

+			'(http://pear.php.net/package/http_request2) PHP/' . phpversion()

+		);

+	}

+

+	/**

+	 * Sets the URL for this request

+	 *

+	 * If the URL has userinfo part (username & password) these will be removed

+	 * and converted to auth data. If the URL does not have a path component,

+	 * that will be set to '/'.

+	 *

+	 * @param string|Net_URL2 $url Request URL

+	 *

+	 * @return   HTTP_Request2

+	 * @throws   HTTP_Request2_LogicException

+	 */

+	public function setUrl($url)

+	{

+		if (is_string($url)) {

+			$url = new Net_URL2(

+				$url, array(Net_URL2::OPTION_USE_BRACKETS => $this->config['use_brackets'])

+			);

+		}

+		if (!$url instanceof Net_URL2) {

+			throw new HTTP_Request2_LogicException(

+				'Parameter is not a valid HTTP URL',

+				HTTP_Request2_Exception::INVALID_ARGUMENT

+			);

+		}

+		// URL contains username / password?

+		if ($url->getUserinfo()) {

+			$username = $url->getUser();

+			$password = $url->getPassword();

+			$this->setAuth(rawurldecode($username), $password? rawurldecode($password): '');

+			$url->setUserinfo('');

+		}

+		if ('' == $url->getPath()) {

+			$url->setPath('/');

+		}

+		$this->url = $url;

+

+		return $this;

+	}

+

+	/**

+	 * Returns the request URL

+	 *

+	 * @return   Net_URL2

+	 */

+	public function getUrl()

+	{

+		return $this->url;

+	}

+

+	/**

+	 * Sets the request method

+	 *

+	 * @param string $method one of the methods defined in RFC 2616

+	 *

+	 * @return   HTTP_Request2

+	 * @throws   HTTP_Request2_LogicException if the method name is invalid

+	 */

+	public function setMethod($method)

+	{

+		// Method name should be a token: http://tools.ietf.org/html/rfc2616#section-5.1.1

+		if (preg_match(self::REGEXP_INVALID_TOKEN, $method)) {

+			throw new HTTP_Request2_LogicException(

+				"Invalid request method '{$method}'",

+				HTTP_Request2_Exception::INVALID_ARGUMENT

+			);

+		}

+		$this->method = $method;

+

+		return $this;

+	}

+

+	/**

+	 * Returns the request method

+	 *

+	 * @return   string

+	 */

+	public function getMethod()

+	{

+		return $this->method;

+	}

+

+	/**

+	 * Sets the configuration parameter(s)

+	 *

+	 * The following parameters are available:

+	 * <ul>

+	 *   <li> 'adapter'           - adapter to use (string)</li>

+	 *   <li> 'connect_timeout'   - Connection timeout in seconds (integer)</li>

+	 *   <li> 'timeout'           - Total number of seconds a request can take.

+	 *                              Use 0 for no limit, should be greater than

+	 *                              'connect_timeout' if set (integer)</li>

+	 *   <li> 'use_brackets'      - Whether to append [] to array variable names (bool)</li>

+	 *   <li> 'protocol_version'  - HTTP Version to use, '1.0' or '1.1' (string)</li>

+	 *   <li> 'buffer_size'       - Buffer size to use for reading and writing (int)</li>

+	 *   <li> 'store_body'        - Whether to store response body in response object.

+	 *                              Set to false if receiving a huge response and

+	 *                              using an Observer to save it (boolean)</li>

+	 *   <li> 'local_ip'          - Specifies the IP address that will be used for accessing

+	 *                              the network (string)</li>

+	 *   <li> 'proxy_type'        - Proxy type, 'http' or 'socks5' (string)</li>

+	 *   <li> 'proxy_host'        - Proxy server host (string)</li>

+	 *   <li> 'proxy_port'        - Proxy server port (integer)</li>

+	 *   <li> 'proxy_user'        - Proxy auth username (string)</li>

+	 *   <li> 'proxy_password'    - Proxy auth password (string)</li>

+	 *   <li> 'proxy_auth_scheme' - Proxy auth scheme, one of HTTP_Request2::AUTH_* constants (string)</li>

+	 *   <li> 'proxy'             - Shorthand for proxy_* parameters, proxy given as URL,

+	 *                              e.g. 'socks5://localhost:1080/' (string)</li>

+	 *   <li> 'ssl_verify_peer'   - Whether to verify peer's SSL certificate (bool)</li>

+	 *   <li> 'ssl_verify_host'   - Whether to check that Common Name in SSL

+	 *                              certificate matches host name (bool)</li>

+	 *   <li> 'ssl_cafile'        - Cerificate Authority file to verify the peer

+	 *                              with (use with 'ssl_verify_peer') (string)</li>

+	 *   <li> 'ssl_capath'        - Directory holding multiple Certificate

+	 *                              Authority files (string)</li>

+	 *   <li> 'ssl_local_cert'    - Name of a file containing local cerificate (string)</li>

+	 *   <li> 'ssl_passphrase'    - Passphrase with which local certificate

+	 *                              was encoded (string)</li>

+	 *   <li> 'digest_compat_ie'  - Whether to imitate behaviour of MSIE 5 and 6

+	 *                              in using URL without query string in digest

+	 *                              authentication (boolean)</li>

+	 *   <li> 'follow_redirects'  - Whether to automatically follow HTTP Redirects (boolean)</li>

+	 *   <li> 'max_redirects'     - Maximum number of redirects to follow (integer)</li>

+	 *   <li> 'strict_redirects'  - Whether to keep request method on redirects via status 301 and

+	 *                              302 (true, needed for compatibility with RFC 2616)

+	 *                              or switch to GET (false, needed for compatibility with most

+	 *                              browsers) (boolean)</li>

+	 * </ul>

+	 *

+	 * @param string|array $nameOrConfig configuration parameter name or array

+	 *                                   ('parameter name' => 'parameter value')

+	 * @param mixed        $value        parameter value if $nameOrConfig is not an array

+	 *

+	 * @return   HTTP_Request2

+	 * @throws   HTTP_Request2_LogicException If the parameter is unknown

+	 */

+	public function setConfig($nameOrConfig, $value = null)

+	{

+		if (is_array($nameOrConfig)) {

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

+				$this->setConfig($name, $value);

+			}

+

+		} elseif ('proxy' == $nameOrConfig) {

+			$url = new Net_URL2($value);

+			$this->setConfig(array(

+				'proxy_type'     => $url->getScheme(),

+				'proxy_host'     => $url->getHost(),

+				'proxy_port'     => $url->getPort(),

+				'proxy_user'     => rawurldecode($url->getUser()),

+				'proxy_password' => rawurldecode($url->getPassword())

+			));

+

+		} else {

+			if (!array_key_exists($nameOrConfig, $this->config)) {

+				throw new HTTP_Request2_LogicException(

+					"Unknown configuration parameter '{$nameOrConfig}'",

+					HTTP_Request2_Exception::INVALID_ARGUMENT

+				);

+			}

+			$this->config[$nameOrConfig] = $value;

+		}

+

+		return $this;

+	}

+

+	/**

+	 * Returns the value(s) of the configuration parameter(s)

+	 *

+	 * @param string $name parameter name

+	 *

+	 * @return   mixed   value of $name parameter, array of all configuration

+	 *                   parameters if $name is not given

+	 * @throws   HTTP_Request2_LogicException If the parameter is unknown

+	 */

+	public function getConfig($name = null)

+	{

+		if (null === $name) {

+			return $this->config;

+		} elseif (!array_key_exists($name, $this->config)) {

+			throw new HTTP_Request2_LogicException(

+				"Unknown configuration parameter '{$name}'",

+				HTTP_Request2_Exception::INVALID_ARGUMENT

+			);

+		}

+		return $this->config[$name];

+	}

+

+	/**

+	 * Sets the autentification data

+	 *

+	 * @param string $user     user name

+	 * @param string $password password

+	 * @param string $scheme   authentication scheme

+	 *

+	 * @return   HTTP_Request2

+	 */

+	public function setAuth($user, $password = '', $scheme = self::AUTH_BASIC)

+	{

+		if (empty($user)) {

+			$this->auth = null;

+		} else {

+			$this->auth = array(

+				'user'     => (string)$user,

+				'password' => (string)$password,

+				'scheme'   => $scheme

+			);

+		}

+

+		return $this;

+	}

+

+	/**

+	 * Returns the authentication data

+	 *

+	 * The array has the keys 'user', 'password' and 'scheme', where 'scheme'

+	 * is one of the HTTP_Request2::AUTH_* constants.

+	 *

+	 * @return   array

+	 */

+	public function getAuth()

+	{

+		return $this->auth;

+	}

+

+	/**

+	 * Sets request header(s)

+	 *

+	 * The first parameter may be either a full header string 'header: value' or

+	 * header name. In the former case $value parameter is ignored, in the latter

+	 * the header's value will either be set to $value or the header will be

+	 * removed if $value is null. The first parameter can also be an array of

+	 * headers, in that case method will be called recursively.

+	 *

+	 * Note that headers are treated case insensitively as per RFC 2616.

+	 *

+	 * <code>

+	 * $req->setHeader('Foo: Bar'); // sets the value of 'Foo' header to 'Bar'

+	 * $req->setHeader('FoO', 'Baz'); // sets the value of 'Foo' header to 'Baz'

+	 * $req->setHeader(array('foo' => 'Quux')); // sets the value of 'Foo' header to 'Quux'

+	 * $req->setHeader('FOO'); // removes 'Foo' header from request

+	 * </code>

+	 *

+	 * @param string|array      $name    header name, header string ('Header: value')

+	 *                                   or an array of headers

+	 * @param string|array|null $value   header value if $name is not an array,

+	 *                                   header will be removed if value is null

+	 * @param bool              $replace whether to replace previous header with the

+	 *                                   same name or append to its value

+	 *

+	 * @return   HTTP_Request2

+	 * @throws   HTTP_Request2_LogicException

+	 */

+	public function setHeader($name, $value = null, $replace = true)

+	{

+		if (is_array($name)) {

+			foreach ($name as $k => $v) {

+				if (is_string($k)) {

+					$this->setHeader($k, $v, $replace);

+				} else {

+					$this->setHeader($v, null, $replace);

+				}

+			}

+		} else {

+			if (null === $value && strpos($name, ':')) {

+				list($name, $value) = array_map('trim', explode(':', $name, 2));

+			}

+			// Header name should be a token: http://tools.ietf.org/html/rfc2616#section-4.2

+			if (preg_match(self::REGEXP_INVALID_TOKEN, $name)) {

+				throw new HTTP_Request2_LogicException(

+					"Invalid header name '{$name}'",

+					HTTP_Request2_Exception::INVALID_ARGUMENT

+				);

+			}

+			// Header names are case insensitive anyway

+			$name = strtolower($name);

+			if (null === $value) {

+				unset($this->headers[$name]);

+

+			} else {

+				if (is_array($value)) {

+					$value = implode(', ', array_map('trim', $value));

+				} elseif (is_string($value)) {

+					$value = trim($value);

+				}

+				if (!isset($this->headers[$name]) || $replace) {

+					$this->headers[$name] = $value;

+				} else {

+					$this->headers[$name] .= ', ' . $value;

+				}

+			}

+		}

+

+		return $this;

+	}

+

+	/**

+	 * Returns the request headers

+	 *

+	 * The array is of the form ('header name' => 'header value'), header names

+	 * are lowercased

+	 *

+	 * @return   array

+	 */

+	public function getHeaders()

+	{

+		return $this->headers;

+	}

+

+	/**

+	 * Adds a cookie to the request

+	 *

+	 * If the request does not have a CookieJar object set, this method simply

+	 * appends a cookie to "Cookie:" header.

+	 *

+	 * If a CookieJar object is available, the cookie is stored in that object.

+	 * Data from request URL will be used for setting its 'domain' and 'path'

+	 * parameters, 'expires' and 'secure' will be set to null and false,

+	 * respectively. If you need further control, use CookieJar's methods.

+	 *

+	 * @param string $name  cookie name

+	 * @param string $value cookie value

+	 *

+	 * @return   HTTP_Request2

+	 * @throws   HTTP_Request2_LogicException

+	 * @see      setCookieJar()

+	 */

+	public function addCookie($name, $value)

+	{

+		if (!empty($this->cookieJar)) {

+			$this->cookieJar->store(

+				array('name' => $name, 'value' => $value), $this->url

+			);

+

+		} else {

+			$cookie = $name . '=' . $value;

+			if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {

+				throw new HTTP_Request2_LogicException(

+					"Invalid cookie: '{$cookie}'",

+					HTTP_Request2_Exception::INVALID_ARGUMENT

+				);

+			}

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

+			$this->setHeader('cookie', $cookies . $cookie);

+		}

+

+		return $this;

+	}

+

+	/**

+	 * Sets the request body

+	 *

+	 * If you provide file pointer rather than file name, it should support

+	 * fstat() and rewind() operations.

+	 *

+	 * @param string|resource|HTTP_Request2_MultipartBody $body       Either a

+	 *               string with the body or filename containing body or

+	 *               pointer to an open file or object with multipart body data

+	 * @param bool                                        $isFilename Whether

+	 *               first parameter is a filename

+	 *

+	 * @return   HTTP_Request2

+	 * @throws   HTTP_Request2_LogicException

+	 */

+	public function setBody($body, $isFilename = false)

+	{

+		if (!$isFilename && !is_resource($body)) {

+			if (!$body instanceof HTTP_Request2_MultipartBody) {

+				$this->body = (string)$body;

+			} else {

+				$this->body = $body;

+			}

+		} else {

+			$fileData = $this->fopenWrapper($body, empty($this->headers['content-type']));

+			$this->body = $fileData['fp'];

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

+				$this->setHeader('content-type', $fileData['type']);

+			}

+		}

+		$this->postParams = $this->uploads = array();

+

+		return $this;

+	}

+

+	/**

+	 * Returns the request body

+	 *

+	 * @return   string|resource|HTTP_Request2_MultipartBody

+	 */

+	public function getBody()

+	{

+		if (self::METHOD_POST == $this->method

+			&& (!empty($this->postParams) || !empty($this->uploads))

+		) {

+			if (0 === strpos($this->headers['content-type'], 'application/x-www-form-urlencoded')) {

+				$body = http_build_query($this->postParams, '', '&');

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

+					$body = preg_replace('/%5B\d+%5D=/', '=', $body);

+				}

+				// support RFC 3986 by not encoding '~' symbol (request #15368)

+				return str_replace('%7E', '~', $body);

+

+			} elseif (0 === strpos($this->headers['content-type'], 'multipart/form-data')) {

+				require_once 'HTTP/Request2/MultipartBody.php';

+				return new HTTP_Request2_MultipartBody(

+					$this->postParams, $this->uploads, $this->getConfig('use_brackets')

+				);

+			}

+		}

+		return $this->body;

+	}

+

+	/**

+	 * Adds a file to form-based file upload

+	 *

+	 * Used to emulate file upload via a HTML form. The method also sets

+	 * Content-Type of HTTP request to 'multipart/form-data'.

+	 *

+	 * If you just want to send the contents of a file as the body of HTTP

+	 * request you should use setBody() method.

+	 *

+	 * If you provide file pointers rather than file names, they should support

+	 * fstat() and rewind() operations.

+	 *

+	 * @param string                $fieldName    name of file-upload field

+	 * @param string|resource|array $filename     full name of local file,

+	 *               pointer to open file or an array of files

+	 * @param string                $sendFilename filename to send in the request

+	 * @param string                $contentType  content-type of file being uploaded

+	 *

+	 * @return   HTTP_Request2

+	 * @throws   HTTP_Request2_LogicException

+	 */

+	public function addUpload(

+		$fieldName, $filename, $sendFilename = null, $contentType = null

+	) {

+		if (!is_array($filename)) {

+			$fileData = $this->fopenWrapper($filename, empty($contentType));

+			$this->uploads[$fieldName] = array(

+				'fp'        => $fileData['fp'],

+				'filename'  => !empty($sendFilename)? $sendFilename

+								:(is_string($filename)? basename($filename): 'anonymous.blob') ,

+				'size'      => $fileData['size'],

+				'type'      => empty($contentType)? $fileData['type']: $contentType

+			);

+		} else {

+			$fps = $names = $sizes = $types = array();

+			foreach ($filename as $f) {

+				if (!is_array($f)) {

+					$f = array($f);

+				}

+				$fileData = $this->fopenWrapper($f[0], empty($f[2]));

+				$fps[]   = $fileData['fp'];

+				$names[] = !empty($f[1])? $f[1]

+							:(is_string($f[0])? basename($f[0]): 'anonymous.blob');

+				$sizes[] = $fileData['size'];

+				$types[] = empty($f[2])? $fileData['type']: $f[2];

+			}

+			$this->uploads[$fieldName] = array(

+				'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types

+			);

+		}

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

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

+		) {

+			$this->setHeader('content-type', 'multipart/form-data');

+		}

+

+		return $this;

+	}

+

+	/**

+	 * Adds POST parameter(s) to the request.

+	 *

+	 * @param string|array $name  parameter name or array ('name' => 'value')

+	 * @param mixed        $value parameter value (can be an array)

+	 *

+	 * @return   HTTP_Request2

+	 */

+	public function addPostParameter($name, $value = null)

+	{

+		if (!is_array($name)) {

+			$this->postParams[$name] = $value;

+		} else {

+			foreach ($name as $k => $v) {

+				$this->addPostParameter($k, $v);

+			}

+		}

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

+			$this->setHeader('content-type', 'application/x-www-form-urlencoded');

+		}

+

+		return $this;

+	}

+

+	/**

+	 * Attaches a new observer

+	 *

+	 * @param SplObserver $observer any object implementing SplObserver

+	 */

+	public function attach(SplObserver $observer)

+	{

+		foreach ($this->observers as $attached) {

+			if ($attached === $observer) {

+				return;

+			}

+		}

+		$this->observers[] = $observer;

+	}

+

+	/**

+	 * Detaches an existing observer

+	 *

+	 * @param SplObserver $observer any object implementing SplObserver

+	 */

+	public function detach(SplObserver $observer)

+	{

+		foreach ($this->observers as $key => $attached) {

+			if ($attached === $observer) {

+				unset($this->observers[$key]);

+				return;

+			}

+		}

+	}

+

+	/**

+	 * Notifies all observers

+	 */

+	public function notify()

+	{

+		foreach ($this->observers as $observer) {

+			$observer->update($this);

+		}

+	}

+

+	/**

+	 * Sets the last event

+	 *

+	 * Adapters should use this method to set the current state of the request

+	 * and notify the observers.

+	 *

+	 * @param string $name event name

+	 * @param mixed  $data event data

+	 */

+	public function setLastEvent($name, $data = null)

+	{

+		$this->lastEvent = array(

+			'name' => $name,

+			'data' => $data

+		);

+		$this->notify();

+	}

+

+	/**

+	 * Returns the last event

+	 *

+	 * Observers should use this method to access the last change in request.

+	 * The following event names are possible:

+	 * <ul>

+	 *   <li>'connect'                 - after connection to remote server,

+	 *                                   data is the destination (string)</li>

+	 *   <li>'disconnect'              - after disconnection from server</li>

+	 *   <li>'sentHeaders'             - after sending the request headers,

+	 *                                   data is the headers sent (string)</li>

+	 *   <li>'sentBodyPart'            - after sending a part of the request body,

+	 *                                   data is the length of that part (int)</li>

+	 *   <li>'sentBody'                - after sending the whole request body,

+	 *                                   data is request body length (int)</li>

+	 *   <li>'receivedHeaders'         - after receiving the response headers,

+	 *                                   data is HTTP_Request2_Response object</li>

+	 *   <li>'receivedBodyPart'        - after receiving a part of the response

+	 *                                   body, data is that part (string)</li>

+	 *   <li>'receivedEncodedBodyPart' - as 'receivedBodyPart', but data is still

+	 *                                   encoded by Content-Encoding</li>

+	 *   <li>'receivedBody'            - after receiving the complete response

+	 *                                   body, data is HTTP_Request2_Response object</li>

+	 * </ul>

+	 * Different adapters may not send all the event types. Mock adapter does

+	 * not send any events to the observers.

+	 *

+	 * @return   array   The array has two keys: 'name' and 'data'

+	 */

+	public function getLastEvent()

+	{

+		return $this->lastEvent;

+	}

+

+	/**

+	 * Sets the adapter used to actually perform the request

+	 *

+	 * You can pass either an instance of a class implementing HTTP_Request2_Adapter

+	 * or a class name. The method will only try to include a file if the class

+	 * name starts with HTTP_Request2_Adapter_, it will also try to prepend this

+	 * prefix to the class name if it doesn't contain any underscores, so that

+	 * <code>

+	 * $request->setAdapter('curl');

+	 * </code>

+	 * will work.

+	 *

+	 * @param string|HTTP_Request2_Adapter $adapter Adapter to use

+	 *

+	 * @return   HTTP_Request2

+	 * @throws   HTTP_Request2_LogicException

+	 */

+	public function setAdapter($adapter)

+	{

+		if (is_string($adapter)) {

+			if (!class_exists($adapter, false)) {

+				if (false === strpos($adapter, '_')) {

+					$adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);

+				}

+				if (!class_exists($adapter, false)

+					&& preg_match('/^HTTP_Request2_Adapter_([a-zA-Z0-9]+)$/', $adapter)

+				) {

+					include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';

+				}

+				if (!class_exists($adapter, false)) {

+					throw new HTTP_Request2_LogicException(

+						"Class {$adapter} not found",

+						HTTP_Request2_Exception::MISSING_VALUE

+					);

+				}

+			}

+			$adapter = new $adapter;

+		}

+		if (!$adapter instanceof HTTP_Request2_Adapter) {

+			throw new HTTP_Request2_LogicException(

+				'Parameter is not a HTTP request adapter',

+				HTTP_Request2_Exception::INVALID_ARGUMENT

+			);

+		}

+		$this->adapter = $adapter;

+

+		return $this;

+	}

+

+	/**

+	 * Sets the cookie jar

+	 *

+	 * A cookie jar is used to maintain cookies across HTTP requests and

+	 * responses. Cookies from jar will be automatically added to the request

+	 * headers based on request URL.

+	 *

+	 * @param HTTP_Request2_CookieJar|bool $jar Existing CookieJar object, true to

+	 *                                          create a new one, false to remove

+	 *

+	 * @return HTTP_Request2

+	 * @throws HTTP_Request2_LogicException

+	 */

+	public function setCookieJar($jar = true)

+	{

+		if (!class_exists('HTTP_Request2_CookieJar', false)) {

+			require_once 'HTTP/Request2/CookieJar.php';

+		}

+

+		if ($jar instanceof HTTP_Request2_CookieJar) {

+			$this->cookieJar = $jar;

+		} elseif (true === $jar) {

+			$this->cookieJar = new HTTP_Request2_CookieJar();

+		} elseif (!$jar) {

+			$this->cookieJar = null;

+		} else {

+			throw new HTTP_Request2_LogicException(

+				'Invalid parameter passed to setCookieJar()',

+				HTTP_Request2_Exception::INVALID_ARGUMENT

+			);

+		}

+

+		return $this;

+	}

+

+	/**

+	 * Returns current CookieJar object or null if none

+	 *

+	 * @return HTTP_Request2_CookieJar|null

+	 */

+	public function getCookieJar()

+	{

+		return $this->cookieJar;

+	}

+

+	/**

+	 * Sends the request and returns the response

+	 *

+	 * @throws   HTTP_Request2_Exception

+	 * @return   HTTP_Request2_Response

+	 */

+	public function send()

+	{

+		// Sanity check for URL

+		if (!$this->url instanceof Net_URL2

+			|| !$this->url->isAbsolute()

+			|| !in_array(strtolower($this->url->getScheme()), array('https', 'http'))

+		) {

+			throw new HTTP_Request2_LogicException(

+				'HTTP_Request2 needs an absolute HTTP(S) request URL, '

+				. ($this->url instanceof Net_URL2

+				   ? "'" . $this->url->__toString() . "'" : 'none')

+				. ' given',

+				HTTP_Request2_Exception::INVALID_ARGUMENT

+			);

+		}

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

+			$this->setAdapter($this->getConfig('adapter'));

+		}

+		// magic_quotes_runtime may break file uploads and chunked response

+		// processing; see bug #4543. Don't use ini_get() here; see bug #16440.

+		if ($magicQuotes = get_magic_quotes_runtime()) {

+			set_magic_quotes_runtime(false);

+		}

+		// force using single byte encoding if mbstring extension overloads

+		// strlen() and substr(); see bug #1781, bug #10605

+		if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {

+			$oldEncoding = mb_internal_encoding();

+			mb_internal_encoding('8bit');

+		}

+

+		try {

+			$response = $this->adapter->sendRequest($this);

+		} catch (Exception $e) {

+		}

+		// cleanup in either case (poor man's "finally" clause)

+		if ($magicQuotes) {

+			set_magic_quotes_runtime(true);

+		}

+		if (!empty($oldEncoding)) {

+			mb_internal_encoding($oldEncoding);

+		}

+		// rethrow the exception

+		if (!empty($e)) {

+			throw $e;

+		}

+		return $response;

+	}

+

+	/**

+	 * Wrapper around fopen()/fstat() used by setBody() and addUpload()

+	 *

+	 * @param string|resource $file       file name or pointer to open file

+	 * @param bool            $detectType whether to try autodetecting MIME

+	 *                        type of file, will only work if $file is a

+	 *                        filename, not pointer

+	 *

+	 * @return array array('fp' => file pointer, 'size' => file size, 'type' => MIME type)

+	 * @throws HTTP_Request2_LogicException

+	 */

+	protected function fopenWrapper($file, $detectType = false)

+	{

+		if (!is_string($file) && !is_resource($file)) {

+			throw new HTTP_Request2_LogicException(

+				"Filename or file pointer resource expected",

+				HTTP_Request2_Exception::INVALID_ARGUMENT

+			);

+		}

+		$fileData = array(

+			'fp'   => is_string($file)? null: $file,

+			'type' => 'application/octet-stream',

+			'size' => 0

+		);

+		if (is_string($file)) {

+			if (!($fileData['fp'] = @fopen($file, 'rb'))) {

+				$error = error_get_last();

+				throw new HTTP_Request2_LogicException(

+					$error['message'], HTTP_Request2_Exception::READ_ERROR

+				);

+			}

+			if ($detectType) {

+				$fileData['type'] = self::detectMimeType($file);

+			}

+		}

+		if (!($stat = fstat($fileData['fp']))) {

+			throw new HTTP_Request2_LogicException(

+				"fstat() call failed", HTTP_Request2_Exception::READ_ERROR

+			);

+		}

+		$fileData['size'] = $stat['size'];

+

+		return $fileData;

+	}

+

+	/**

+	 * Tries to detect MIME type of a file

+	 *

+	 * The method will try to use fileinfo extension if it is available,

+	 * deprecated mime_content_type() function in the other case. If neither

+	 * works, default 'application/octet-stream' MIME type is returned

+	 *

+	 * @param string $filename file name

+	 *

+	 * @return   string  file MIME type

+	 */

+	protected static function detectMimeType($filename)

+	{

+		// finfo extension from PECL available

+		if (function_exists('finfo_open')) {

+			if (!isset(self::$_fileinfoDb)) {

+				self::$_fileinfoDb = @finfo_open(FILEINFO_MIME);

+			}

+			if (self::$_fileinfoDb) {

+				$info = finfo_file(self::$_fileinfoDb, $filename);

+			}

+		}

+		// (deprecated) mime_content_type function available

+		if (empty($info) && function_exists('mime_content_type')) {

+			return mime_content_type($filename);

+		}

+		return empty($info)? 'application/octet-stream': $info;

+	}

 }

 ?>

Spacing +21 added lines, -21 removed lines

@@ -213,8 +213,8 @@ 
             $this->setMethod($method);

         }

         $this->setHeader(

-            'user-agent', 'HTTP_Request2/2.2.1 ' .

-            '(http://pear.php.net/package/http_request2) PHP/' . phpversion()

+            'user-agent', 'HTTP_Request2/2.2.1 '.

+            '(http://pear.php.net/package/http_request2) PHP/'.phpversion()

         );

     }

 

@@ -247,7 +247,7 @@ 
         if ($url->getUserinfo()) {

             $username = $url->getUser();

             $password = $url->getPassword();

-            $this->setAuth(rawurldecode($username), $password? rawurldecode($password): '');

+            $this->setAuth(rawurldecode($username), $password ? rawurldecode($password) : '');

             $url->setUserinfo('');

         }

         if ('' == $url->getPath()) {

@@ -421,8 +421,8 @@ 
             $this->auth = null;

         } else {

             $this->auth = array(

-                'user'     => (string)$user,

-                'password' => (string)$password,

+                'user'     => (string) $user,

+                'password' => (string) $password,

                 'scheme'   => $scheme

             );

         }

@@ -506,7 +506,7 @@ 
                 if (!isset($this->headers[$name]) || $replace) {

                     $this->headers[$name] = $value;

                 } else {

-                    $this->headers[$name] .= ', ' . $value;

+                    $this->headers[$name] .= ', '.$value;

                 }

             }

         }

@@ -553,15 +553,15 @@ 
             );

 

         } else {

-            $cookie = $name . '=' . $value;

+            $cookie = $name.'='.$value;

             if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {

                 throw new HTTP_Request2_LogicException(

                     "Invalid cookie: '{$cookie}'",

                     HTTP_Request2_Exception::INVALID_ARGUMENT

                 );

             }

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

-            $this->setHeader('cookie', $cookies . $cookie);

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

+            $this->setHeader('cookie', $cookies.$cookie);

         }

 

         return $this;

@@ -586,7 +586,7 @@ 
     {

         if (!$isFilename && !is_resource($body)) {

             if (!$body instanceof HTTP_Request2_MultipartBody) {

-                $this->body = (string)$body;

+                $this->body = (string) $body;

             } else {

                 $this->body = $body;

             }

@@ -658,10 +658,10 @@ 
             $fileData = $this->fopenWrapper($filename, empty($contentType));

             $this->uploads[$fieldName] = array(

                 'fp'        => $fileData['fp'],

-                'filename'  => !empty($sendFilename)? $sendFilename

-                                :(is_string($filename)? basename($filename): 'anonymous.blob') ,

+                'filename'  => !empty($sendFilename) ? $sendFilename

+                                :(is_string($filename) ? basename($filename) : 'anonymous.blob'),

                 'size'      => $fileData['size'],

-                'type'      => empty($contentType)? $fileData['type']: $contentType

+                'type'      => empty($contentType) ? $fileData['type'] : $contentType

             );

         } else {

             $fps = $names = $sizes = $types = array();

@@ -671,10 +671,10 @@ 
                 }

                 $fileData = $this->fopenWrapper($f[0], empty($f[2]));

                 $fps[]   = $fileData['fp'];

-                $names[] = !empty($f[1])? $f[1]

-                            :(is_string($f[0])? basename($f[0]): 'anonymous.blob');

+                $names[] = !empty($f[1]) ? $f[1]

+                            :(is_string($f[0]) ? basename($f[0]) : 'anonymous.blob');

                 $sizes[] = $fileData['size'];

-                $types[] = empty($f[2])? $fileData['type']: $f[2];

+                $types[] = empty($f[2]) ? $fileData['type'] : $f[2];

             }

             $this->uploads[$fieldName] = array(

                 'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types

@@ -827,12 +827,12 @@ 
         if (is_string($adapter)) {

             if (!class_exists($adapter, false)) {

                 if (false === strpos($adapter, '_')) {

-                    $adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);

+                    $adapter = 'HTTP_Request2_Adapter_'.ucfirst($adapter);

                 }

                 if (!class_exists($adapter, false)

                     && preg_match('/^HTTP_Request2_Adapter_([a-zA-Z0-9]+)$/', $adapter)

                 ) {

-                    include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';

+                    include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter).'.php';

                 }

                 if (!class_exists($adapter, false)) {

                     throw new HTTP_Request2_LogicException(

@@ -915,7 +915,7 @@ 
             throw new HTTP_Request2_LogicException(

                 'HTTP_Request2 needs an absolute HTTP(S) request URL, '

                 . ($this->url instanceof Net_URL2

-                   ? "'" . $this->url->__toString() . "'" : 'none')

+                   ? "'".$this->url->__toString()."'" : 'none')

                 . ' given',

                 HTTP_Request2_Exception::INVALID_ARGUMENT

             );

@@ -973,7 +973,7 @@ 
             );

         }

         $fileData = array(

-            'fp'   => is_string($file)? null: $file,

+            'fp'   => is_string($file) ? null : $file,

             'type' => 'application/octet-stream',

             'size' => 0

         );

@@ -1024,7 +1024,7 @@ 
         if (empty($info) && function_exists('mime_content_type')) {

             return mime_content_type($filename);

         }

-        return empty($info)? 'application/octet-stream': $info;

+        return empty($info) ? 'application/octet-stream' : $info;

     }

 }

 ?>

Doc Comments +2 added lines, -2 removed lines

@@ -261,7 +261,7 @@ 
     /**

      * Returns the request URL

      *

-     * @return   Net_URL2

+     * @return   string

      */

     public function getUrl()

     {

@@ -573,7 +573,7 @@ 
      * If you provide file pointer rather than file name, it should support

      * fstat() and rewind() operations.

      *

-     * @param string|resource|HTTP_Request2_MultipartBody $body       Either a

+     * @param string $body       Either a

      *               string with the body or filename containing body or

      *               pointer to an open file or object with multipart body data

      * @param bool                                        $isFilename Whether

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

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);

             }

         }

 

Indentation +528 added lines, -528 removed lines

@@ -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);

+	}

 }

 ?>

Spacing +7 added lines, -7 removed lines

@@ -139,7 +139,7 @@ 
     protected static function wrapCurlError($ch)

     {

         $nativeCode = curl_errno($ch);

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

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

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

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

         } else {

@@ -300,11 +300,11 @@ 
                     'Proxy port not provided', HTTP_Request2_Exception::MISSING_VALUE

                 );

             }

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

+            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')

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

                 );

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

                 case HTTP_Request2::AUTH_BASIC:

@@ -332,7 +332,7 @@ 
 

         // set authentication data

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

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

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

             switch ($auth['scheme']) {

             case HTTP_Request2::AUTH_BASIC:

                 curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);

@@ -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

@@ -380,7 +380,7 @@ 
         $headersFmt = array();

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

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

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

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

         }

         curl_setopt($ch, CURLOPT_HTTPHEADER, $headersFmt);