xpressengine / xe-core

modules/widget/widget.view.php

Braces +10 added lines, -5 removed lines

@@ -21,7 +21,9 @@ 
 	function dispWidgetInfo()
 	{
 		// If people have skin widget widget output as a function of the skin More Details
-		if(Context::get('skin')) return $this->dispWidgetSkinInfo();
+		if(Context::get('skin')) {
+			return $this->dispWidgetSkinInfo();
+		}
 		// Wanted widget is selected information
 		$oWidgetModel = getModel('widget');
 		$widget_info = $oWidgetModel->getWidgetInfo(Context::get('selected_widget'));
@@ -62,7 +64,9 @@ 
 
 		$widget_list = $oWidgetModel->getDownloadedWidgetList();
 		$selected_widget = Context::get('selected_widget');
-		if(!$selected_widget) $selected_widget = $widget_list[0]->widget;
+		if(!$selected_widget) {
+			$selected_widget = $widget_list[0]->widget;
+		}
 
 		$widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
 		Context::set('widget_info', $widget_info);
@@ -89,8 +93,7 @@ 
 			foreach($mid_list as $module_srl => $module) {
 				$module_categories[$module->module_category_srl]->list[$module_srl] = $module;
 			}
-		}
-		else
+		} else
 		{
 			$module_categories[0] = new stdClass();
 			$module_categories[0]->list = $mid_list;
@@ -118,7 +121,9 @@ 
 		$widget_list = $oWidgetModel->getDownloadedWidgetList();
 		Context::set('widget_list',$widget_list);
 		// When there is no widget is selected in the first widget
-		if(!Context::get('selected_widget')) Context::set('selected_widget',$widget_list[0]->widget);
+		if(!Context::get('selected_widget')) {
+			Context::set('selected_widget',$widget_list[0]->widget);
+		}
 
 		$this->dispWidgetGenerateCode();
 		$this->setLayoutFile('default_layout');

Spacing +12 added lines, -12 removed lines

@@ -21,7 +21,7 @@ 
 	function dispWidgetInfo()
 	{
 		// If people have skin widget widget output as a function of the skin More Details
-		if(Context::get('skin')) return $this->dispWidgetSkinInfo();
+		if (Context::get('skin')) return $this->dispWidgetSkinInfo();
 		// Wanted widget is selected information
 		$oWidgetModel = getModel('widget');
 		$widget_info = $oWidgetModel->getWidgetInfo(Context::get('selected_widget'));
@@ -45,7 +45,7 @@ 
 		$oModuleModel = getModel('module');
 		$skin_info = $oModuleModel->loadSkinInfo($path, $skin);
 
-		Context::set('skin_info',$skin_info);
+		Context::set('skin_info', $skin_info);
 		// Specifies the widget to pop up
 		$this->setLayoutFile('popup_layout');
 		// Set a template file
@@ -62,7 +62,7 @@ 
 
 		$widget_list = $oWidgetModel->getDownloadedWidgetList();
 		$selected_widget = Context::get('selected_widget');
-		if(!$selected_widget) $selected_widget = $widget_list[0]->widget;
+		if (!$selected_widget) $selected_widget = $widget_list[0]->widget;
 
 		$widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
 		Context::set('widget_info', $widget_info);
@@ -84,9 +84,9 @@ 
 		$group_list = $oMemberModel->getGroups($site_module_info->site_srl);
 		Context::set('group_list', $group_list);
 		// module_category and module combination
-		if($module_categories)
+		if ($module_categories)
 		{
-			foreach($mid_list as $module_srl => $module) {
+			foreach ($mid_list as $module_srl => $module) {
 				$module_categories[$module->module_category_srl]->list[$module_srl] = $module;
 			}
 		}
@@ -96,10 +96,10 @@ 
 			$module_categories[0]->list = $mid_list;
 		}
 
-		Context::set('mid_list',$module_categories);
+		Context::set('mid_list', $module_categories);
 		// Menu Get a list
 		$output = executeQueryArray('menu.getMenus');
-		Context::set('menu_list',$output->data);
+		Context::set('menu_list', $output->data);
 		// Wanted information on skin
 		$skin_list = $oModuleModel->getSkins($widget_info->path);
 		Context::set('skin_list', $skin_list);
@@ -116,9 +116,9 @@ 
 	{
 		$oWidgetModel = getModel('widget');
 		$widget_list = $oWidgetModel->getDownloadedWidgetList();
-		Context::set('widget_list',$widget_list);
+		Context::set('widget_list', $widget_list);
 		// When there is no widget is selected in the first widget
-		if(!Context::get('selected_widget')) Context::set('selected_widget',$widget_list[0]->widget);
+		if (!Context::get('selected_widget')) Context::set('selected_widget', $widget_list[0]->widget);
 
 		$this->dispWidgetGenerateCode();
 		$this->setLayoutFile('default_layout');
@@ -133,13 +133,13 @@ 
 		// Widget-style list
 		$oWidgetModel = getModel('widget');
 		$widgetStyle_list = $oWidgetModel->getDownloadedWidgetStyleList();
-		Context::set('widgetStyle_list',$widgetStyle_list);
+		Context::set('widgetStyle_list', $widgetStyle_list);
 		// Selected list of widget styles
 		$widgetstyle = Context::get('widgetstyle');
 		$widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetstyle);
-		if($widgetstyle && $widgetstyle_info)
+		if ($widgetstyle && $widgetstyle_info)
 		{
-			Context::set('widgetstyle_info',$widgetstyle_info);
+			Context::set('widgetstyle_info', $widgetstyle_info);
 		}
 
 		$this->dispWidgetGenerateCode();

tools/dbxml_validator/connect_wrapper.php

Indentation +82 added lines, -82 removed lines

@@ -12,7 +12,7 @@ 
 /**

   @brief

   @developer

-  */

+ */

 class DBMysqlConnectWrapper extends DBMysql

 {

 	public $queries = '';

@@ -22,7 +22,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function __construct()

 	{

 		$this->db_type = 'mysql';

@@ -34,7 +34,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function create()

 	{

 		return new DBMysqlConnectWrapper();

@@ -45,7 +45,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function actDBClassStart()

 	{

 	}

@@ -56,7 +56,7 @@ 
 		@return

 		@access

 		@param $query

-		*/

+	 */

 	public function actStart($query)

 	{

 	}

@@ -66,7 +66,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function actFinish()

 	{

 	}

@@ -76,7 +76,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function actDBClassFinish()

 	{

 	}

@@ -86,7 +86,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function isSupported()

 	{

 		// No need to actually check for 'mysql_connect' function

@@ -99,7 +99,7 @@ 
 		@return

 		@access

 		@param $connection

-		*/

+	 */

 	public function __connect($connection)

 	{

 		return TRUE;

@@ -111,7 +111,7 @@ 
 		@return

 		@access

 		@param $connection

-		*/

+	 */

 	public function _afterConnect($connection)

 	{

 	}

@@ -122,7 +122,7 @@ 
 		@return

 		@access

 		@param $connection

-		*/

+	 */

 	public function _close($connection)

 	{

 	}

@@ -134,7 +134,7 @@ 
 		@access

 		@param $type

 		@param $indx

-		*/

+	 */

 	public function close($type = 'master', $indx = NULL)

 	{

 	}

@@ -144,7 +144,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function _begin()

 	{

 		return TRUE;

@@ -155,7 +155,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function _rollback()

 	{

 		return TRUE;

@@ -166,7 +166,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function _commit()

 	{

 		return TRUE;

@@ -179,7 +179,7 @@ 
 		@access

 		@param $query

 		@param $connection

-		*/

+	 */

 	public function __query($query, $connection)

 	{

 		$this->queries .= "\n" . $query;

@@ -194,7 +194,7 @@ 
 		@access

 		@param $result

 		@param $arrayIndexEndValue

-		*/

+	 */

 	public function _fetch($result, $arrayIndexEndValue = NULL)

 	{

 		return new Any_prop_obj_base();

@@ -206,7 +206,7 @@ 
 		@return

 		@access

 		@param $target_name

-		*/

+	 */

 	public function isTableExists($target_name)

 	{

 		parent::isTableExists($target_name);

@@ -219,7 +219,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function db_insert_id()

 	{

 		return NULL;

@@ -231,7 +231,7 @@ 
 		@return

 		@access

 		@param $result

-		*/

+	 */

 	public function db_fetch_object(&$result)

 	{

 		return new Any_prop_obj_base();

@@ -241,7 +241,7 @@ 
 /**

   @brief

   @developer

-  */

+ */

 class DBMysqliConnectWrapper extends DBMysqli

 {

 	public $queries = '';

@@ -251,7 +251,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function __construct()

 	{

 		$this->db_type = 'mysqli';

@@ -263,7 +263,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function create()

 	{

 		return new DBMysqlConnectWrapper();

@@ -274,7 +274,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function actDBClassStart()

 	{

 	}

@@ -285,7 +285,7 @@ 
 		@return

 		@access

 		@param $query

-		*/

+	 */

 	public function actStart($query)

 	{

 	}

@@ -295,7 +295,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function actFinish()

 	{

 	}

@@ -305,7 +305,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function actDBClassFinish()

 	{

 	}

@@ -315,7 +315,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function isSupported()

 	{

 		// No need to actually check for 'mysql_connect' function

@@ -328,7 +328,7 @@ 
 		@return

 		@access

 		@param $target_name

-		*/

+	 */

 	public function isTableExists($target_name)

 	{

 		parent::isTableExists($target_name);

@@ -344,7 +344,7 @@ 
 		@return

 		@access

 		@param $string

-		*/

+	 */

 	public function addQuotes($string)

 	{

 		if(version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())

@@ -366,7 +366,7 @@ 
 		@return

 		@access

 		@param $connection

-		*/

+	 */

 	public function __connect($connection)

 	{

 		return TRUE;

@@ -378,7 +378,7 @@ 
 		@return

 		@access

 		@param $connection

-		*/

+	 */

 	public function _afterConnect($connection)

 	{

 	}

@@ -389,7 +389,7 @@ 
 		@return

 		@access

 		@param $connection

-		*/

+	 */

 	public function _close($connection)

 	{

 	}

@@ -401,7 +401,7 @@ 
 		@access

 		@param $type

 		@param $indx

-		*/

+	 */

 	public function close($type = 'master', $indx = NULL)

 	{

 	}

@@ -411,7 +411,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function _begin()

 	{

 		return TRUE;

@@ -422,7 +422,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function _rollback()

 	{

 		return TRUE;

@@ -433,7 +433,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function _commit()

 	{

 		return TRUE;

@@ -446,7 +446,7 @@ 
 		@access

 		@param $query

 		@param $connection

-		*/

+	 */

 	public function __query($query, $connection)

 	{

 		$this->queries .= "\n" . $query;

@@ -461,7 +461,7 @@ 
 		@access

 		@param $result

 		@param $arrayIndexEndValue

-		*/

+	 */

 	public function _fetch($result, $arrayIndexEndValue = NULL)

 	{

 		return new Any_prop_obj_base();

@@ -472,7 +472,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function db_insert_id()

 	{

 		return NULL;

@@ -484,7 +484,7 @@ 
 		@return

 		@access

 		@param $result

-		*/

+	 */

 	public function db_fetch_object(&$result)

 	{

 		return new Any_prop_obj_base();

@@ -494,7 +494,7 @@ 
 /**

   @brief

   @developer

-  */

+ */

 class DBCubridConnectWrapper extends DBCubrid

 {

 	public $queries = '';

@@ -504,7 +504,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function __construct()

 	{

 		$this->db_type = 'cubrid';

@@ -516,7 +516,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function create()

 	{

 		return new DBMysqlConnectWrapper();

@@ -527,7 +527,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function actDBClassStart()

 	{

 	}

@@ -538,7 +538,7 @@ 
 		@return

 		@access

 		@param $query

-		*/

+	 */

 	public function actStart($query)

 	{

 	}

@@ -548,7 +548,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function _makeSequence()

 	{

 		return TRUE;

@@ -559,7 +559,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function actFinish()

 	{

 	}

@@ -569,7 +569,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function actDBClassFinish()

 	{

 	}

@@ -579,7 +579,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function isSupported()

 	{

 		// No need to actually check for 'cubrid_connect' function

@@ -592,7 +592,7 @@ 
 		@return

 		@access

 		@param $target_name

-		*/

+	 */

 	public function isTableExists($target_name)

 	{

 		try

@@ -612,7 +612,7 @@ 
 		@return

 		@access

 		@param $connection

-		*/

+	 */

 	public function __connect($connection)

 	{

 		return TRUE;

@@ -624,7 +624,7 @@ 
 		@return

 		@access

 		@param $connection

-		*/

+	 */

 	public function _afterConnect($connection)

 	{

 	}

@@ -635,7 +635,7 @@ 
 		@return

 		@access

 		@param $connection

-		*/

+	 */

 	public function _close($connection)

 	{

 	}

@@ -647,7 +647,7 @@ 
 		@access

 		@param $type

 		@param $indx

-		*/

+	 */

 	public function close($type = 'master', $indx = NULL)

 	{

 	}

@@ -657,7 +657,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function _begin()

 	{

 		return TRUE;

@@ -668,7 +668,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function _rollback()

 	{

 		return TRUE;

@@ -679,7 +679,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function _commit()

 	{

 		return TRUE;

@@ -692,7 +692,7 @@ 
 		@access

 		@param $query

 		@param $connection

-		*/

+	 */

 	public function __query($query, $connection)

 	{

 		$this->queries .= "\n" . $query;

@@ -707,7 +707,7 @@ 
 		@access

 		@param $result

 		@param $arrayIndexEndValue

-		*/

+	 */

 	public function _fetch($result, $arrayIndexEndValue = NULL)

 	{

 		return new Any_prop_obj_base();

@@ -718,7 +718,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function db_insert_id()

 	{

 		return NULL;

@@ -729,7 +729,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function &db_fetch_object()

 	{

 		return new Any_prop_obj_base();

@@ -739,7 +739,7 @@ 
 /**

   @brief

   @developer

-  */

+ */

 class DBMssqlConnectWrapper extends DBMssql

 {

 	public $queries = '';

@@ -749,7 +749,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function __construct()

 	{

 		$this->db_type = 'mssql';

@@ -761,7 +761,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function create()

 	{

 		return new DBMssqlConnectWrapper();

@@ -772,7 +772,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function actDBClassStart()

 	{

 	}

@@ -783,7 +783,7 @@ 
 		@return

 		@access

 		@param $query

-		*/

+	 */

 	public function actStart($query)

 	{

 	}

@@ -793,7 +793,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function actFinish()

 	{

 	}

@@ -803,7 +803,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function actDBClassFinish()

 	{

 	}

@@ -813,7 +813,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function isSupported()

 	{

 		// No need to actually check for 'mssql_connect' function

@@ -826,7 +826,7 @@ 
 		@return

 		@access

 		@param $target_name

-		*/

+	 */

 	public function isTableExists($target_name)

 	{

 		parent::isTableExists($target_name);

@@ -840,7 +840,7 @@ 
 		@return

 		@access

 		@param $connection

-		*/

+	 */

 	public function __connect($connection)

 	{

 		return TRUE;

@@ -852,7 +852,7 @@ 
 		@return

 		@access

 		@param $connection

-		*/

+	 */

 	public function _afterConnect($connection)

 	{

 	}

@@ -863,7 +863,7 @@ 
 		@return

 		@access

 		@param $connection

-		*/

+	 */

 	public function _close($connection)

 	{

 	}

@@ -875,7 +875,7 @@ 
 		@access

 		@param $type

 		@param $indx

-		*/

+	 */

 	public function close($type = 'master', $indx = NULL)

 	{

 	}

@@ -885,7 +885,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function _begin()

 	{

 		return TRUE;

@@ -896,7 +896,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function _rollback()

 	{

 		return TRUE;

@@ -907,7 +907,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function _commit()

 	{

 		return TRUE;

@@ -920,7 +920,7 @@ 
 		@access

 		@param $query

 		@param $connection

-		*/

+	 */

 	public function __query($query, $connection)

 	{

 		if($this->queries)

@@ -940,7 +940,7 @@ 
 		@access

 		@param $result

 		@param $arrayIndexEndValue

-		*/

+	 */

 	public function _fetch($result, $arrayIndexEndValue = NULL)

 	{

 		return new Any_prop_obj_base();

@@ -951,7 +951,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function db_insert_id()

 	{

 		return NULL;

@@ -962,7 +962,7 @@ 
 		@developer

 		@return

 		@access

-		*/

+	 */

 	public function &db_fetch_object()

 	{

 		return new Any_prop_obj_base();

Braces +1 added lines, -2 removed lines

@@ -598,8 +598,7 @@
 		try

 		{

 			parent::isTableExists($target_name);

-		}

-		catch (Exception $ex)

+		} catch (Exception $ex)

 		{

 		}

 

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
 	public function __construct()

 	{

 		$this->db_type = 'mysql';

-		$this->_setDBInfo();	// Context::get() should indicate a mysql db

+		$this->_setDBInfo(); // Context::get() should indicate a mysql db

 	}

 

 	/**

@@ -182,7 +182,7 @@ 
 		*/

 	public function __query($query, $connection)

 	{

-		$this->queries .= "\n" . $query;

+		$this->queries .= "\n".$query;

 

 		return TRUE;

 	}

@@ -255,7 +255,7 @@ 
 	public function __construct()

 	{

 		$this->db_type = 'mysqli';

-		$this->_setDBInfo();	// Context::get() should indicate a mysqli db

+		$this->_setDBInfo(); // Context::get() should indicate a mysqli db

 	}

 

 	/**

@@ -347,12 +347,12 @@ 
 		*/

 	public function addQuotes($string)

 	{

-		if(version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())

+		if (version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())

 		{

 			$string = stripslashes(str_replace("\\", "\\\\", $string));

 		}

 

-		if(!is_numeric($string))

+		if (!is_numeric($string))

 		{

 			$string = @mysql_real_escape_string($string);

 		}

@@ -449,7 +449,7 @@ 
 		*/

 	public function __query($query, $connection)

 	{

-		$this->queries .= "\n" . $query;

+		$this->queries .= "\n".$query;

 

 		return TRUE;

 	}

@@ -508,7 +508,7 @@ 
 	public function __construct()

 	{

 		$this->db_type = 'cubrid';

-		$this->_setDBInfo();	// Context::get() should indicate a CUBRID db

+		$this->_setDBInfo(); // Context::get() should indicate a CUBRID db

 	}

 

 	/**

@@ -695,7 +695,7 @@ 
 		*/

 	public function __query($query, $connection)

 	{

-		$this->queries .= "\n" . $query;

+		$this->queries .= "\n".$query;

 

 		return TRUE;

 	}

@@ -753,7 +753,7 @@ 
 	public function __construct()

 	{

 		$this->db_type = 'mssql';

-		$this->_setDBInfo();	// Context::get() should indicate a MS Sql db

+		$this->_setDBInfo(); // Context::get() should indicate a MS Sql db

 	}

 

 	/**

@@ -923,7 +923,7 @@ 
 		*/

 	public function __query($query, $connection)

 	{

-		if($this->queries)

+		if ($this->queries)

 		{

 			$this->queries .= ";\n";

 		}

widgets/counter_status/counter_status.class.php

Spacing +5 added lines, -5 removed lines

@@ -19,13 +19,13 @@
 		$oCounterModel = getModel('counter');
 
 		$site_module_info = Context::get('site_module_info');
-		$output = $oCounterModel->getStatus(array('00000000', date('Ymd', $_SERVER['REQUEST_TIME']-60*60*24), date('Ymd')), $site_module_info->site_srl);
-		if(count($output))
+		$output = $oCounterModel->getStatus(array('00000000', date('Ymd', $_SERVER['REQUEST_TIME'] - 60 * 60 * 24), date('Ymd')), $site_module_info->site_srl);
+		if (count($output))
 		{
-			foreach($output as $key => $val) 
+			foreach ($output as $key => $val) 
 			{
-				if(!$key) Context::set('total_counter', $val);
-				elseif($key == date("Ymd")) Context::set('today_counter', $val);
+				if (!$key) Context::set('total_counter', $val);
+				elseif ($key == date("Ymd")) Context::set('today_counter', $val);
 				else Context::set('yesterday_counter', $val);
 			}
 		}

Braces +7 added lines, -3 removed lines

@@ -24,9 +24,13 @@
 		{
 			foreach($output as $key => $val) 
 			{
-				if(!$key) Context::set('total_counter', $val);
-				elseif($key == date("Ymd")) Context::set('today_counter', $val);
-				else Context::set('yesterday_counter', $val);
+				if(!$key) {
+					Context::set('total_counter', $val);
+				} elseif($key == date("Ymd")) {
+					Context::set('today_counter', $val);
+				} else {
+					Context::set('yesterday_counter', $val);
+				}
 			}
 		}
 		// Set a path of the template skin (values of skin, colorset settings)

widgets/login_info/login_info.class.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 		$tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
 		Context::set('colorset', $args->colorset);
 		// Specify a template file
-		if(Context::get('is_logged')) $tpl_file = 'login_info';
+		if (Context::get('is_logged')) $tpl_file = 'login_info';
 		else $tpl_file = 'login_form';
 		// Get the member configuration
 		$oModuleModel = getModel('module');
@@ -31,11 +31,11 @@ 
 		// Set a flag to check if the https connection is made when using SSL and create https url 
 		$ssl_mode = false;
 		$useSsl = Context::getSslStatus();
-		if($useSsl != 'none')
+		if ($useSsl != 'none')
 		{
-			if(strncasecmp('https://', Context::getRequestUri(), 8) === 0) $ssl_mode = true;
+			if (strncasecmp('https://', Context::getRequestUri(), 8) === 0) $ssl_mode = true;
 		}
-		Context::set('ssl_mode',$ssl_mode);
+		Context::set('ssl_mode', $ssl_mode);
 
 		// Compile a template
 		$oTemplate = &TemplateHandler::getInstance();

Braces +8 added lines, -3 removed lines

@@ -21,8 +21,11 @@ 
 		$tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
 		Context::set('colorset', $args->colorset);
 		// Specify a template file
-		if(Context::get('is_logged')) $tpl_file = 'login_info';
-		else $tpl_file = 'login_form';
+		if(Context::get('is_logged')) {
+			$tpl_file = 'login_info';
+		} else {
+			$tpl_file = 'login_form';
+		}
 		// Get the member configuration
 		$oModuleModel = getModel('module');
 		$this->member_config = $oModuleModel->getModuleConfig('member');
@@ -33,7 +36,9 @@ 
 		$useSsl = Context::getSslStatus();
 		if($useSsl != 'none')
 		{
-			if(strncasecmp('https://', Context::getRequestUri(), 8) === 0) $ssl_mode = true;
+			if(strncasecmp('https://', Context::getRequestUri(), 8) === 0) {
+				$ssl_mode = true;
+			}
 		}
 		Context::set('ssl_mode',$ssl_mode);
 

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

Indentation +57 added lines, -57 removed lines

@@ -74,7 +74,7 @@ 
     * A queue of responses to be returned by sendRequest()
     * @var  array
     */
-    protected $responses = array();
+	protected $responses = array();
 
    /**
     * Returns the next response from the queue built by addResponse()
@@ -86,23 +86,23 @@ 
     * @return   HTTP_Request2_Response
     * @throws   Exception
     */
-    public function sendRequest(HTTP_Request2 $request)
-    {
-        if (count($this->responses) > 0) {
-            $response = array_shift($this->responses);
-            if ($response instanceof HTTP_Request2_Response) {
-                return $response;
-            } else {
-                // rethrow the exception
-                $class   = get_class($response);
-                $message = $response->getMessage();
-                $code    = $response->getCode();
-                throw new $class($message, $code);
-            }
-        } else {
-            return self::createResponseFromString("HTTP/1.1 400 Bad Request\r\n\r\n");
-        }
-    }
+	public function sendRequest(HTTP_Request2 $request)
+	{
+		if (count($this->responses) > 0) {
+			$response = array_shift($this->responses);
+			if ($response instanceof HTTP_Request2_Response) {
+				return $response;
+			} else {
+				// rethrow the exception
+				$class   = get_class($response);
+				$message = $response->getMessage();
+				$code    = $response->getCode();
+				throw new $class($message, $code);
+			}
+		} else {
+			return self::createResponseFromString("HTTP/1.1 400 Bad Request\r\n\r\n");
+		}
+	}
 
    /**
     * Adds response to the queue
@@ -111,19 +111,19 @@ 
     *                   an instance of HTTP_Request2_Response or Exception
     * @throws   HTTP_Request2_Exception
     */
-    public function addResponse($response)
-    {
-        if (is_string($response)) {
-            $response = self::createResponseFromString($response);
-        } elseif (is_resource($response)) {
-            $response = self::createResponseFromFile($response);
-        } elseif (!$response instanceof HTTP_Request2_Response &&
-                  !$response instanceof Exception
-        ) {
-            throw new HTTP_Request2_Exception('Parameter is not a valid response');
-        }
-        $this->responses[] = $response;
-    }
+	public function addResponse($response)
+	{
+		if (is_string($response)) {
+			$response = self::createResponseFromString($response);
+		} elseif (is_resource($response)) {
+			$response = self::createResponseFromFile($response);
+		} elseif (!$response instanceof HTTP_Request2_Response &&
+				  !$response instanceof Exception
+		) {
+			throw new HTTP_Request2_Exception('Parameter is not a valid response');
+		}
+		$this->responses[] = $response;
+	}
 
    /**
     * Creates a new HTTP_Request2_Response object from a string
@@ -132,20 +132,20 @@ 
     * @return   HTTP_Request2_Response
     * @throws   HTTP_Request2_Exception
     */
-    public static function createResponseFromString($str)
-    {
-        $parts       = preg_split('!(\r?\n){2}!m', $str, 2);
-        $headerLines = explode("\n", $parts[0]);
-        $response    = new HTTP_Request2_Response(array_shift($headerLines));
-        foreach ($headerLines as $headerLine) {
-            $response->parseHeaderLine($headerLine);
-        }
-        $response->parseHeaderLine('');
-        if (isset($parts[1])) {
-            $response->appendBody($parts[1]);
-        }
-        return $response;
-    }
+	public static function createResponseFromString($str)
+	{
+		$parts       = preg_split('!(\r?\n){2}!m', $str, 2);
+		$headerLines = explode("\n", $parts[0]);
+		$response    = new HTTP_Request2_Response(array_shift($headerLines));
+		foreach ($headerLines as $headerLine) {
+			$response->parseHeaderLine($headerLine);
+		}
+		$response->parseHeaderLine('');
+		if (isset($parts[1])) {
+			$response->appendBody($parts[1]);
+		}
+		return $response;
+	}
 
    /**
     * Creates a new HTTP_Request2_Response object from a file
@@ -154,18 +154,18 @@ 
     * @return   HTTP_Request2_Response
     * @throws   HTTP_Request2_Exception
     */
-    public static function createResponseFromFile($fp)
-    {
-        $response = new HTTP_Request2_Response(fgets($fp));
-        do {
-            $headerLine = fgets($fp);
-            $response->parseHeaderLine($headerLine);
-        } while ('' != trim($headerLine));
+	public static function createResponseFromFile($fp)
+	{
+		$response = new HTTP_Request2_Response(fgets($fp));
+		do {
+			$headerLine = fgets($fp);
+			$response->parseHeaderLine($headerLine);
+		} while ('' != trim($headerLine));
 
-        while (!feof($fp)) {
-            $response->appendBody(fread($fp, 8192));
-        }
-        return $response;
-    }
+		while (!feof($fp)) {
+			$response->appendBody(fread($fp, 8192));
+		}
+		return $response;
+	}
 }
 ?>
\ No newline at end of file

libs/phpmailer/language/phpmailer.lang-en.php

Indentation +2 added lines, -2 removed lines

@@ -7,14 +7,14 @@
 $PHPMAILER_LANG = array();
 
 $PHPMAILER_LANG["provide_address"] = 'You must provide at least one ' .
-                                     'recipient email address.';
+									 'recipient email address.';
 $PHPMAILER_LANG["mailer_not_supported"] = ' mailer is not supported.';
 $PHPMAILER_LANG["execute"] = 'Could not execute: ';
 $PHPMAILER_LANG["instantiate"] = 'Could not instantiate mail function.';
 $PHPMAILER_LANG["authenticate"] = 'SMTP Error: Could not authenticate.';
 $PHPMAILER_LANG["from_failed"] = 'The following From address failed: ';
 $PHPMAILER_LANG["recipients_failed"] = 'SMTP Error: The following ' .
-                                       'recipients failed: ';
+									   'recipients failed: ';
 $PHPMAILER_LANG["data_not_accepted"] = 'SMTP Error: Data not accepted.';
 $PHPMAILER_LANG["connect_host"] = 'SMTP Error: Could not connect to SMTP host.';
 $PHPMAILER_LANG["file_access"] = 'Could not access file: ';

Spacing +2 added lines, -2 removed lines

@@ -6,14 +6,14 @@
 
 $PHPMAILER_LANG = array();
 
-$PHPMAILER_LANG["provide_address"] = 'You must provide at least one ' .
+$PHPMAILER_LANG["provide_address"] = 'You must provide at least one '.
                                      'recipient email address.';
 $PHPMAILER_LANG["mailer_not_supported"] = ' mailer is not supported.';
 $PHPMAILER_LANG["execute"] = 'Could not execute: ';
 $PHPMAILER_LANG["instantiate"] = 'Could not instantiate mail function.';
 $PHPMAILER_LANG["authenticate"] = 'SMTP Error: Could not authenticate.';
 $PHPMAILER_LANG["from_failed"] = 'The following From address failed: ';
-$PHPMAILER_LANG["recipients_failed"] = 'SMTP Error: The following ' .
+$PHPMAILER_LANG["recipients_failed"] = 'SMTP Error: The following '.
                                        'recipients failed: ';
 $PHPMAILER_LANG["data_not_accepted"] = 'SMTP Error: Data not accepted.';
 $PHPMAILER_LANG["connect_host"] = 'SMTP Error: Could not connect to SMTP host.';

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

Indentation +48 added lines, -48 removed lines

@@ -36,58 +36,58 @@
  */

 class HTTP_Request2_Exception extends PEAR_Exception

 {

-    /** An invalid argument was passed to a method */

-    const INVALID_ARGUMENT   = 1;

-    /** Some required value was not available */

-    const MISSING_VALUE      = 2;

-    /** Request cannot be processed due to errors in PHP configuration */

-    const MISCONFIGURATION   = 3;

-    /** Error reading the local file */

-    const READ_ERROR         = 4;

+	/** An invalid argument was passed to a method */

+	const INVALID_ARGUMENT   = 1;

+	/** Some required value was not available */

+	const MISSING_VALUE      = 2;

+	/** Request cannot be processed due to errors in PHP configuration */

+	const MISCONFIGURATION   = 3;

+	/** Error reading the local file */

+	const READ_ERROR         = 4;

 

-    /** Server returned a response that does not conform to HTTP protocol */

-    const MALFORMED_RESPONSE = 10;

-    /** Failure decoding Content-Encoding or Transfer-Encoding of response */

-    const DECODE_ERROR       = 20;

-    /** Operation timed out */

-    const TIMEOUT            = 30;

-    /** Number of redirects exceeded 'max_redirects' configuration parameter */

-    const TOO_MANY_REDIRECTS = 40;

-    /** Redirect to a protocol other than http(s):// */

-    const NON_HTTP_REDIRECT  = 50;

+	/** Server returned a response that does not conform to HTTP protocol */

+	const MALFORMED_RESPONSE = 10;

+	/** Failure decoding Content-Encoding or Transfer-Encoding of response */

+	const DECODE_ERROR       = 20;

+	/** Operation timed out */

+	const TIMEOUT            = 30;

+	/** Number of redirects exceeded 'max_redirects' configuration parameter */

+	const TOO_MANY_REDIRECTS = 40;

+	/** Redirect to a protocol other than http(s):// */

+	const NON_HTTP_REDIRECT  = 50;

 

-    /**

-     * Native error code

-     * @var int

-     */

-    private $_nativeCode;

+	/**

+	 * Native error code

+	 * @var int

+	 */

+	private $_nativeCode;

 

-    /**

-     * Constructor, can set package error code and native error code

-     *

-     * @param string $message    exception message

-     * @param int    $code       package error code, one of class constants

-     * @param int    $nativeCode error code from underlying PHP extension

-     */

-    public function __construct($message = null, $code = null, $nativeCode = null)

-    {

-        parent::__construct($message, $code);

-        $this->_nativeCode = $nativeCode;

-    }

+	/**

+	 * Constructor, can set package error code and native error code

+	 *

+	 * @param string $message    exception message

+	 * @param int    $code       package error code, one of class constants

+	 * @param int    $nativeCode error code from underlying PHP extension

+	 */

+	public function __construct($message = null, $code = null, $nativeCode = null)

+	{

+		parent::__construct($message, $code);

+		$this->_nativeCode = $nativeCode;

+	}

 

-    /**

-     * Returns error code produced by underlying PHP extension

-     *

-     * For Socket Adapter this may contain error number returned by

-     * stream_socket_client(), for Curl Adapter this will contain error number

-     * returned by curl_errno()

-     *

-     * @return integer

-     */

-    public function getNativeCode()

-    {

-        return $this->_nativeCode;

-    }

+	/**

+	 * Returns error code produced by underlying PHP extension

+	 *

+	 * For Socket Adapter this may contain error number returned by

+	 * stream_socket_client(), for Curl Adapter this will contain error number

+	 * returned by curl_errno()

+	 *

+	 * @return integer

+	 */

+	public function getNativeCode()

+	{

+		return $this->_nativeCode;

+	}

 }

 

 /**

libs/PEAR/HTTP/Request/Listener.php

Indentation +17 added lines, -17 removed lines

@@ -60,17 +60,17 @@ 
     * A listener's identifier
     * @var string
     */
-    var $_id;
+	var $_id;
 
    /**
     * Constructor, sets the object's identifier
     *
     * @access public
     */
-    function HTTP_Request_Listener()
-    {
-        $this->_id = md5(uniqid('http_request_', 1));
-    }
+	function HTTP_Request_Listener()
+	{
+		$this->_id = md5(uniqid('http_request_', 1));
+	}
 
 
    /**
@@ -79,10 +79,10 @@ 
     * @access public
     * @return string
     */
-    function getId()
-    {
-        return $this->_id;
-    }
+	function getId()
+	{
+		return $this->_id;
+	}
 
 
    /**
@@ -94,13 +94,13 @@ 
     * @param    mixed   Additional data
     * @abstract
     */
-    function update(&$subject, $event, $data = null)
-    {
-        echo "Notified of event: '$event'\n";
-        if (null !== $data) {
-            echo "Additional data: ";
-            var_dump($data);
-        }
-    }
+	function update(&$subject, $event, $data = null)
+	{
+		echo "Notified of event: '$event'\n";
+		if (null !== $data) {
+			echo "Additional data: ";
+			var_dump($data);
+		}
+	}
 }
 ?>

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

Indentation +719 added lines, -719 removed lines

@@ -62,19 +62,19 @@ 
    /**
     * Regular expression for 'token' rule from RFC 2616
     */
-    const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';
+	const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';
 
    /**
     * Regular expression for 'quoted-string' rule from RFC 2616
     */
-    const REGEXP_QUOTED_STRING = '"(?:\\\\.|[^\\\\"])*"';
+	const REGEXP_QUOTED_STRING = '"(?:\\\\.|[^\\\\"])*"';
 
    /**
     * Connected sockets, needed for Keep-Alive support
     * @var  array
     * @see  connect()
     */
-    protected static $sockets = array();
+	protected static $sockets = array();
 
    /**
     * Data for digest authentication scheme
@@ -88,39 +88,39 @@ 
     *
     * @var  array
     */
-    protected static $challenges = array();
+	protected static $challenges = array();
 
    /**
     * Connected socket
     * @var  resource
     * @see  connect()
     */
-    protected $socket;
+	protected $socket;
 
    /**
     * Challenge used for server digest authentication
     * @var  array
     */
-    protected $serverChallenge;
+	protected $serverChallenge;
 
    /**
     * Challenge used for proxy digest authentication
     * @var  array
     */
-    protected $proxyChallenge;
+	protected $proxyChallenge;
 
    /**
     * Sum of start time and global timeout, exception will be thrown if request continues past this time
     * @var  integer
     */
-    protected $deadline = null;
+	protected $deadline = null;
 
    /**
     * Remaining length of the current chunk, when reading chunked response
     * @var  integer
     * @see  readChunked()
     */
-    protected $chunkLength = 0;
+	protected $chunkLength = 0;
 
    /**
     * Remaining amount of redirections to follow
@@ -130,7 +130,7 @@ 
     *
     * @var  integer
     */
-    protected $redirectCountdown = null;
+	protected $redirectCountdown = null;
 
    /**
     * Sends request to the remote server and returns its response
@@ -139,69 +139,69 @@ 
     * @return   HTTP_Request2_Response
     * @throws   HTTP_Request2_Exception
     */
-    public function sendRequest(HTTP_Request2 $request)
-    {
-        $this->request = $request;
-
-        // Use global request timeout if given, see feature requests #5735, #8964
-        if ($timeout = $request->getConfig('timeout')) {
-            $this->deadline = time() + $timeout;
-        } else {
-            $this->deadline = null;
-        }
-
-        try {
-            $keepAlive = $this->connect();
-            $headers   = $this->prepareHeaders();
-            if (false === @fwrite($this->socket, $headers, strlen($headers))) {
-                throw new HTTP_Request2_Exception('Error writing request');
-            }
-            // provide request headers to the observer, see request #7633
-            $this->request->setLastEvent('sentHeaders', $headers);
-            $this->writeBody();
-
-            if ($this->deadline && time() > $this->deadline) {
-                throw new HTTP_Request2_Exception(
-                    'Request timed out after ' .
-                    $request->getConfig('timeout') . ' second(s)'
-                );
-            }
-
-            $response = $this->readResponse();
-
-            if (!$this->canKeepAlive($keepAlive, $response)) {
-                $this->disconnect();
-            }
-
-            if ($this->shouldUseProxyDigestAuth($response)) {
-                return $this->sendRequest($request);
-            }
-            if ($this->shouldUseServerDigestAuth($response)) {
-                return $this->sendRequest($request);
-            }
-            if ($authInfo = $response->getHeader('authentication-info')) {
-                $this->updateChallenge($this->serverChallenge, $authInfo);
-            }
-            if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {
-                $this->updateChallenge($this->proxyChallenge, $proxyInfo);
-            }
-
-        } catch (Exception $e) {
-            $this->disconnect();
-        }
-
-        unset($this->request, $this->requestBody);
-
-        if (!empty($e)) {
-            throw $e;
-        }
-
-        if (!$request->getConfig('follow_redirects') || !$response->isRedirect()) {
-            return $response;
-        } else {
-            return $this->handleRedirect($request, $response);
-        }
-    }
+	public function sendRequest(HTTP_Request2 $request)
+	{
+		$this->request = $request;
+
+		// Use global request timeout if given, see feature requests #5735, #8964
+		if ($timeout = $request->getConfig('timeout')) {
+			$this->deadline = time() + $timeout;
+		} else {
+			$this->deadline = null;
+		}
+
+		try {
+			$keepAlive = $this->connect();
+			$headers   = $this->prepareHeaders();
+			if (false === @fwrite($this->socket, $headers, strlen($headers))) {
+				throw new HTTP_Request2_Exception('Error writing request');
+			}
+			// provide request headers to the observer, see request #7633
+			$this->request->setLastEvent('sentHeaders', $headers);
+			$this->writeBody();
+
+			if ($this->deadline && time() > $this->deadline) {
+				throw new HTTP_Request2_Exception(
+					'Request timed out after ' .
+					$request->getConfig('timeout') . ' second(s)'
+				);
+			}
+
+			$response = $this->readResponse();
+
+			if (!$this->canKeepAlive($keepAlive, $response)) {
+				$this->disconnect();
+			}
+
+			if ($this->shouldUseProxyDigestAuth($response)) {
+				return $this->sendRequest($request);
+			}
+			if ($this->shouldUseServerDigestAuth($response)) {
+				return $this->sendRequest($request);
+			}
+			if ($authInfo = $response->getHeader('authentication-info')) {
+				$this->updateChallenge($this->serverChallenge, $authInfo);
+			}
+			if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {
+				$this->updateChallenge($this->proxyChallenge, $proxyInfo);
+			}
+
+		} catch (Exception $e) {
+			$this->disconnect();
+		}
+
+		unset($this->request, $this->requestBody);
+
+		if (!empty($e)) {
+			throw $e;
+		}
+
+		if (!$request->getConfig('follow_redirects') || !$response->isRedirect()) {
+			return $response;
+		} else {
+			return $this->handleRedirect($request, $response);
+		}
+	}
 
    /**
     * Connects to the remote server
@@ -209,114 +209,114 @@ 
     * @return   bool    whether the connection can be persistent
     * @throws   HTTP_Request2_Exception
     */
-    protected function connect()
-    {
-        $secure  = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');
-        $tunnel  = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
-        $headers = $this->request->getHeaders();
-        $reqHost = $this->request->getUrl()->getHost();
-        if (!($reqPort = $this->request->getUrl()->getPort())) {
-            $reqPort = $secure? 443: 80;
-        }
-
-        if ($host = $this->request->getConfig('proxy_host')) {
-            if (!($port = $this->request->getConfig('proxy_port'))) {
-                throw new HTTP_Request2_Exception('Proxy port not provided');
-            }
-            $proxy = true;
-        } else {
-            $host  = $reqHost;
-            $port  = $reqPort;
-            $proxy = false;
-        }
-
-        if ($tunnel && !$proxy) {
-            throw new HTTP_Request2_Exception(
-                "Trying to perform CONNECT request without proxy"
-            );
-        }
-        if ($secure && !in_array('ssl', stream_get_transports())) {
-            throw new HTTP_Request2_Exception(
-                'Need OpenSSL support for https:// requests'
-            );
-        }
-
-        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive
-        // connection token to a proxy server...
-        if ($proxy && !$secure &&
-            !empty($headers['connection']) && 'Keep-Alive' == $headers['connection']
-        ) {
-            $this->request->setHeader('connection');
-        }
-
-        $keepAlive = ('1.1' == $this->request->getConfig('protocol_version') &&
-                      empty($headers['connection'])) ||
-                     (!empty($headers['connection']) &&
-                      'Keep-Alive' == $headers['connection']);
-        $host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;
-
-        $options = array();
-        if ($secure || $tunnel) {
-            foreach ($this->request->getConfig() as $name => $value) {
-                if ('ssl_' == substr($name, 0, 4) && null !== $value) {
-                    if ('ssl_verify_host' == $name) {
-                        if ($value) {
-                            $options['CN_match'] = $reqHost;
-                        }
-                    } else {
-                        $options[substr($name, 4)] = $value;
-                    }
-                }
-            }
-            ksort($options);
-        }
-
-        // Changing SSL context options after connection is established does *not*
-        // work, we need a new connection if options change
-        $remote    = $host . ':' . $port;
-        $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .
-                     (empty($options)? '': ':' . serialize($options));
-        unset($this->socket);
-
-        // We use persistent connections and have a connected socket?
-        // Ensure that the socket is still connected, see bug #16149
-        if ($keepAlive && !empty(self::$sockets[$socketKey]) &&
-            !feof(self::$sockets[$socketKey])
-        ) {
-            $this->socket =& self::$sockets[$socketKey];
-
-        } elseif ($secure && $proxy && !$tunnel) {
-            $this->establishTunnel();
-            $this->request->setLastEvent(
-                'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"
-            );
-            self::$sockets[$socketKey] =& $this->socket;
-
-        } else {
-            // Set SSL context options if doing HTTPS request or creating a tunnel
-            $context = stream_context_create();
-            foreach ($options as $name => $value) {
-                if (!stream_context_set_option($context, 'ssl', $name, $value)) {
-                    throw new HTTP_Request2_Exception(
-                        "Error setting SSL context option '{$name}'"
-                    );
-                }
-            }
-            $this->socket = @stream_socket_client(
-                $remote, $errno, $errstr,
-                $this->request->getConfig('connect_timeout'),
-                STREAM_CLIENT_CONNECT, $context
-            );
-            if (!$this->socket) {
-                throw new HTTP_Request2_Exception(
-                    "Unable to connect to {$remote}. Error #{$errno}: {$errstr}"
-                );
-            }
-            $this->request->setLastEvent('connect', $remote);
-            self::$sockets[$socketKey] =& $this->socket;
-        }
-        return $keepAlive;
-    }
+	protected function connect()
+	{
+		$secure  = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');
+		$tunnel  = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
+		$headers = $this->request->getHeaders();
+		$reqHost = $this->request->getUrl()->getHost();
+		if (!($reqPort = $this->request->getUrl()->getPort())) {
+			$reqPort = $secure? 443: 80;
+		}
+
+		if ($host = $this->request->getConfig('proxy_host')) {
+			if (!($port = $this->request->getConfig('proxy_port'))) {
+				throw new HTTP_Request2_Exception('Proxy port not provided');
+			}
+			$proxy = true;
+		} else {
+			$host  = $reqHost;
+			$port  = $reqPort;
+			$proxy = false;
+		}
+
+		if ($tunnel && !$proxy) {
+			throw new HTTP_Request2_Exception(
+				"Trying to perform CONNECT request without proxy"
+			);
+		}
+		if ($secure && !in_array('ssl', stream_get_transports())) {
+			throw new HTTP_Request2_Exception(
+				'Need OpenSSL support for https:// requests'
+			);
+		}
+
+		// RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive
+		// connection token to a proxy server...
+		if ($proxy && !$secure &&
+			!empty($headers['connection']) && 'Keep-Alive' == $headers['connection']
+		) {
+			$this->request->setHeader('connection');
+		}
+
+		$keepAlive = ('1.1' == $this->request->getConfig('protocol_version') &&
+					  empty($headers['connection'])) ||
+					 (!empty($headers['connection']) &&
+					  'Keep-Alive' == $headers['connection']);
+		$host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;
+
+		$options = array();
+		if ($secure || $tunnel) {
+			foreach ($this->request->getConfig() as $name => $value) {
+				if ('ssl_' == substr($name, 0, 4) && null !== $value) {
+					if ('ssl_verify_host' == $name) {
+						if ($value) {
+							$options['CN_match'] = $reqHost;
+						}
+					} else {
+						$options[substr($name, 4)] = $value;
+					}
+				}
+			}
+			ksort($options);
+		}
+
+		// Changing SSL context options after connection is established does *not*
+		// work, we need a new connection if options change
+		$remote    = $host . ':' . $port;
+		$socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .
+					 (empty($options)? '': ':' . serialize($options));
+		unset($this->socket);
+
+		// We use persistent connections and have a connected socket?
+		// Ensure that the socket is still connected, see bug #16149
+		if ($keepAlive && !empty(self::$sockets[$socketKey]) &&
+			!feof(self::$sockets[$socketKey])
+		) {
+			$this->socket =& self::$sockets[$socketKey];
+
+		} elseif ($secure && $proxy && !$tunnel) {
+			$this->establishTunnel();
+			$this->request->setLastEvent(
+				'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"
+			);
+			self::$sockets[$socketKey] =& $this->socket;
+
+		} else {
+			// Set SSL context options if doing HTTPS request or creating a tunnel
+			$context = stream_context_create();
+			foreach ($options as $name => $value) {
+				if (!stream_context_set_option($context, 'ssl', $name, $value)) {
+					throw new HTTP_Request2_Exception(
+						"Error setting SSL context option '{$name}'"
+					);
+				}
+			}
+			$this->socket = @stream_socket_client(
+				$remote, $errno, $errstr,
+				$this->request->getConfig('connect_timeout'),
+				STREAM_CLIENT_CONNECT, $context
+			);
+			if (!$this->socket) {
+				throw new HTTP_Request2_Exception(
+					"Unable to connect to {$remote}. Error #{$errno}: {$errstr}"
+				);
+			}
+			$this->request->setLastEvent('connect', $remote);
+			self::$sockets[$socketKey] =& $this->socket;
+		}
+		return $keepAlive;
+	}
 
    /**
     * Establishes a tunnel to a secure remote server via HTTP CONNECT request
@@ -328,40 +328,40 @@ 
     * @link     http://tools.ietf.org/html/rfc2817#section-5.2
     * @throws   HTTP_Request2_Exception
     */
-    protected function establishTunnel()
-    {
-        $donor   = new self;
-        $connect = new HTTP_Request2(
-            $this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,
-            array_merge($this->request->getConfig(),
-                        array('adapter' => $donor))
-        );
-        $response = $connect->send();
-        // Need any successful (2XX) response
-        if (200 > $response->getStatus() || 300 <= $response->getStatus()) {
-            throw new HTTP_Request2_Exception(
-                'Failed to connect via HTTPS proxy. Proxy response: ' .
-                $response->getStatus() . ' ' . $response->getReasonPhrase()
-            );
-        }
-        $this->socket = $donor->socket;
-
-        $modes = array(
-            STREAM_CRYPTO_METHOD_TLS_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv2_CLIENT
-        );
-
-        foreach ($modes as $mode) {
-            if (stream_socket_enable_crypto($this->socket, true, $mode)) {
-                return;
-            }
-        }
-        throw new HTTP_Request2_Exception(
-            'Failed to enable secure connection when connecting through proxy'
-        );
-    }
+	protected function establishTunnel()
+	{
+		$donor   = new self;
+		$connect = new HTTP_Request2(
+			$this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,
+			array_merge($this->request->getConfig(),
+						array('adapter' => $donor))
+		);
+		$response = $connect->send();
+		// Need any successful (2XX) response
+		if (200 > $response->getStatus() || 300 <= $response->getStatus()) {
+			throw new HTTP_Request2_Exception(
+				'Failed to connect via HTTPS proxy. Proxy response: ' .
+				$response->getStatus() . ' ' . $response->getReasonPhrase()
+			);
+		}
+		$this->socket = $donor->socket;
+
+		$modes = array(
+			STREAM_CRYPTO_METHOD_TLS_CLIENT,
+			STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
+			STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
+			STREAM_CRYPTO_METHOD_SSLv2_CLIENT
+		);
+
+		foreach ($modes as $mode) {
+			if (stream_socket_enable_crypto($this->socket, true, $mode)) {
+				return;
+			}
+		}
+		throw new HTTP_Request2_Exception(
+			'Failed to enable secure connection when connecting through proxy'
+		);
+	}
 
    /**
     * Checks whether current connection may be reused or should be closed
@@ -371,34 +371,34 @@ 
     * @param    HTTP_Request2_Response  response object to check
     * @return   boolean
     */
-    protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)
-    {
-        // Do not close socket on successful CONNECT request
-        if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
-            200 <= $response->getStatus() && 300 > $response->getStatus()
-        ) {
-            return true;
-        }
-
-        $lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding')) ||
-                       null !== $response->getHeader('content-length');
-        $persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||
-                       (null === $response->getHeader('connection') &&
-                        '1.1' == $response->getVersion());
-        return $requestKeepAlive && $lengthKnown && $persistent;
-    }
+	protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)
+	{
+		// Do not close socket on successful CONNECT request
+		if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
+			200 <= $response->getStatus() && 300 > $response->getStatus()
+		) {
+			return true;
+		}
+
+		$lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding')) ||
+					   null !== $response->getHeader('content-length');
+		$persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||
+					   (null === $response->getHeader('connection') &&
+						'1.1' == $response->getVersion());
+		return $requestKeepAlive && $lengthKnown && $persistent;
+	}
 
    /**
     * Disconnects from the remote server
     */
-    protected function disconnect()
-    {
-        if (is_resource($this->socket)) {
-            fclose($this->socket);
-            $this->socket = null;
-            $this->request->setLastEvent('disconnect');
-        }
-    }
+	protected function disconnect()
+	{
+		if (is_resource($this->socket)) {
+			fclose($this->socket);
+			$this->socket = null;
+			$this->request->setLastEvent('disconnect');
+		}
+	}
 
    /**
     * Handles HTTP redirection
@@ -412,49 +412,49 @@ 
     * @return   HTTP_Request2_Response      Response from a new location
     * @throws   HTTP_Request2_Exception
     */
-    protected function handleRedirect(HTTP_Request2 $request,
-                                      HTTP_Request2_Response $response)
-    {
-        if (is_null($this->redirectCountdown)) {
-            $this->redirectCountdown = $request->getConfig('max_redirects');
-        }
-        if (0 == $this->redirectCountdown) {
-            // Copying cURL behaviour
-            throw new HTTP_Request2_Exception(
-                'Maximum (' . $request->getConfig('max_redirects') . ') redirects followed'
-            );
-        }
-        $redirectUrl = new Net_URL2(
-            $response->getHeader('location'),
-            array(Net_URL2::OPTION_USE_BRACKETS => $request->getConfig('use_brackets'))
-        );
-        // refuse non-HTTP redirect
-        if ($redirectUrl->isAbsolute()
-            && !in_array($redirectUrl->getScheme(), array('http', 'https'))
-        ) {
-            throw new HTTP_Request2_Exception(
-                'Refusing to redirect to a non-HTTP URL ' . $redirectUrl->__toString()
-            );
-        }
-        // Theoretically URL should be absolute (see http://tools.ietf.org/html/rfc2616#section-14.30),
-        // but in practice it is often not
-        if (!$redirectUrl->isAbsolute()) {
-            $redirectUrl = $request->getUrl()->resolve($redirectUrl);
-        }
-        $redirect = clone $request;
-        $redirect->setUrl($redirectUrl);
-        if (303 == $response->getStatus() || (!$request->getConfig('strict_redirects')
-             && in_array($response->getStatus(), array(301, 302)))
-        ) {
-            $redirect->setMethod(HTTP_Request2::METHOD_GET);
-            $redirect->setBody('');
-        }
-
-        if (0 < $this->redirectCountdown) {
-            $this->redirectCountdown--;
-        }
-        return $this->sendRequest($redirect);
-    }
+	protected function handleRedirect(HTTP_Request2 $request,
+									  HTTP_Request2_Response $response)
+	{
+		if (is_null($this->redirectCountdown)) {
+			$this->redirectCountdown = $request->getConfig('max_redirects');
+		}
+		if (0 == $this->redirectCountdown) {
+			// Copying cURL behaviour
+			throw new HTTP_Request2_Exception(
+				'Maximum (' . $request->getConfig('max_redirects') . ') redirects followed'
+			);
+		}
+		$redirectUrl = new Net_URL2(
+			$response->getHeader('location'),
+			array(Net_URL2::OPTION_USE_BRACKETS => $request->getConfig('use_brackets'))
+		);
+		// refuse non-HTTP redirect
+		if ($redirectUrl->isAbsolute()
+			&& !in_array($redirectUrl->getScheme(), array('http', 'https'))
+		) {
+			throw new HTTP_Request2_Exception(
+				'Refusing to redirect to a non-HTTP URL ' . $redirectUrl->__toString()
+			);
+		}
+		// Theoretically URL should be absolute (see http://tools.ietf.org/html/rfc2616#section-14.30),
+		// but in practice it is often not
+		if (!$redirectUrl->isAbsolute()) {
+			$redirectUrl = $request->getUrl()->resolve($redirectUrl);
+		}
+		$redirect = clone $request;
+		$redirect->setUrl($redirectUrl);
+		if (303 == $response->getStatus() || (!$request->getConfig('strict_redirects')
+			 && in_array($response->getStatus(), array(301, 302)))
+		) {
+			$redirect->setMethod(HTTP_Request2::METHOD_GET);
+			$redirect->setBody('');
+		}
+
+		if (0 < $this->redirectCountdown) {
+			$this->redirectCountdown--;
+		}
+		return $this->sendRequest($redirect);
+	}
 
    /**
     * Checks whether another request should be performed with server digest auth
@@ -473,52 +473,52 @@ 
     * @return   boolean whether another request should be performed
     * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
     */
-    protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)
-    {
-        // no sense repeating a request if we don't have credentials
-        if (401 != $response->getStatus() || !$this->request->getAuth()) {
-            return false;
-        }
-        if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {
-            return false;
-        }
-
-        $url    = $this->request->getUrl();
-        $scheme = $url->getScheme();
-        $host   = $scheme . '://' . $url->getHost();
-        if ($port = $url->getPort()) {
-            if ((0 == strcasecmp($scheme, 'http') && 80 != $port) ||
-                (0 == strcasecmp($scheme, 'https') && 443 != $port)
-            ) {
-                $host .= ':' . $port;
-            }
-        }
-
-        if (!empty($challenge['domain'])) {
-            $prefixes = array();
-            foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {
-                // don't bother with different servers
-                if ('/' == substr($prefix, 0, 1)) {
-                    $prefixes[] = $host . $prefix;
-                }
-            }
-        }
-        if (empty($prefixes)) {
-            $prefixes = array($host . '/');
-        }
-
-        $ret = true;
-        foreach ($prefixes as $prefix) {
-            if (!empty(self::$challenges[$prefix]) &&
-                (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
-            ) {
-                // probably credentials are invalid
-                $ret = false;
-            }
-            self::$challenges[$prefix] =& $challenge;
-        }
-        return $ret;
-    }
+	protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)
+	{
+		// no sense repeating a request if we don't have credentials
+		if (401 != $response->getStatus() || !$this->request->getAuth()) {
+			return false;
+		}
+		if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {
+			return false;
+		}
+
+		$url    = $this->request->getUrl();
+		$scheme = $url->getScheme();
+		$host   = $scheme . '://' . $url->getHost();
+		if ($port = $url->getPort()) {
+			if ((0 == strcasecmp($scheme, 'http') && 80 != $port) ||
+				(0 == strcasecmp($scheme, 'https') && 443 != $port)
+			) {
+				$host .= ':' . $port;
+			}
+		}
+
+		if (!empty($challenge['domain'])) {
+			$prefixes = array();
+			foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {
+				// don't bother with different servers
+				if ('/' == substr($prefix, 0, 1)) {
+					$prefixes[] = $host . $prefix;
+				}
+			}
+		}
+		if (empty($prefixes)) {
+			$prefixes = array($host . '/');
+		}
+
+		$ret = true;
+		foreach ($prefixes as $prefix) {
+			if (!empty(self::$challenges[$prefix]) &&
+				(empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
+			) {
+				// probably credentials are invalid
+				$ret = false;
+			}
+			self::$challenges[$prefix] =& $challenge;
+		}
+		return $ret;
+	}
 
    /**
     * Checks whether another request should be performed with proxy digest auth
@@ -537,28 +537,28 @@ 
     * @return   boolean whether another request should be performed
     * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
     */
-    protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)
-    {
-        if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {
-            return false;
-        }
-        if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {
-            return false;
-        }
-
-        $key = 'proxy://' . $this->request->getConfig('proxy_host') .
-               ':' . $this->request->getConfig('proxy_port');
-
-        if (!empty(self::$challenges[$key]) &&
-            (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
-        ) {
-            $ret = false;
-        } else {
-            $ret = true;
-        }
-        self::$challenges[$key] = $challenge;
-        return $ret;
-    }
+	protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)
+	{
+		if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {
+			return false;
+		}
+		if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {
+			return false;
+		}
+
+		$key = 'proxy://' . $this->request->getConfig('proxy_host') .
+			   ':' . $this->request->getConfig('proxy_port');
+
+		if (!empty(self::$challenges[$key]) &&
+			(empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
+		) {
+			$ret = false;
+		} else {
+			$ret = true;
+		}
+		self::$challenges[$key] = $challenge;
+		return $ret;
+	}
 
    /**
     * Extracts digest method challenge from (WWW|Proxy)-Authenticate header value
@@ -588,48 +588,48 @@ 
     *                   no challenge is present in header value
     * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
     */
-    protected function parseDigestChallenge($headerValue)
-    {
-        $authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';
-        $challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";
-        if (!preg_match($challenge, $headerValue, $matches)) {
-            return false;
-        }
-
-        preg_match_all('!' . $authParam . '!', $matches[0], $params);
-        $paramsAry   = array();
-        $knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',
-                             'algorithm', 'qop');
-        for ($i = 0; $i < count($params[0]); $i++) {
-            // section 3.2.1: Any unrecognized directive MUST be ignored.
-            if (in_array($params[1][$i], $knownParams)) {
-                if ('"' == substr($params[2][$i], 0, 1)) {
-                    $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
-                } else {
-                    $paramsAry[$params[1][$i]] = $params[2][$i];
-                }
-            }
-        }
-        // we only support qop=auth
-        if (!empty($paramsAry['qop']) &&
-            !in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))
-        ) {
-            throw new HTTP_Request2_Exception(
-                "Only 'auth' qop is currently supported in digest authentication, " .
-                "server requested '{$paramsAry['qop']}'"
-            );
-        }
-        // we only support algorithm=MD5
-        if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {
-            throw new HTTP_Request2_Exception(
-                "Only 'MD5' algorithm is currently supported in digest authentication, " .
-                "server requested '{$paramsAry['algorithm']}'"
-            );
-        }
-
-        return $paramsAry;
-    }
+	protected function parseDigestChallenge($headerValue)
+	{
+		$authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
+					   self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';
+		$challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";
+		if (!preg_match($challenge, $headerValue, $matches)) {
+			return false;
+		}
+
+		preg_match_all('!' . $authParam . '!', $matches[0], $params);
+		$paramsAry   = array();
+		$knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',
+							 'algorithm', 'qop');
+		for ($i = 0; $i < count($params[0]); $i++) {
+			// section 3.2.1: Any unrecognized directive MUST be ignored.
+			if (in_array($params[1][$i], $knownParams)) {
+				if ('"' == substr($params[2][$i], 0, 1)) {
+					$paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
+				} else {
+					$paramsAry[$params[1][$i]] = $params[2][$i];
+				}
+			}
+		}
+		// we only support qop=auth
+		if (!empty($paramsAry['qop']) &&
+			!in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))
+		) {
+			throw new HTTP_Request2_Exception(
+				"Only 'auth' qop is currently supported in digest authentication, " .
+				"server requested '{$paramsAry['qop']}'"
+			);
+		}
+		// we only support algorithm=MD5
+		if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {
+			throw new HTTP_Request2_Exception(
+				"Only 'MD5' algorithm is currently supported in digest authentication, " .
+				"server requested '{$paramsAry['algorithm']}'"
+			);
+		}
+
+		return $paramsAry;
+	}
 
    /**
     * Parses [Proxy-]Authentication-Info header value and updates challenge
@@ -638,26 +638,26 @@ 
     * @param    string  value of [Proxy-]Authentication-Info header
     * @todo     validate server rspauth response
     */
-    protected function updateChallenge(&$challenge, $headerValue)
-    {
-        $authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';
-        $paramsAry   = array();
-
-        preg_match_all($authParam, $headerValue, $params);
-        for ($i = 0; $i < count($params[0]); $i++) {
-            if ('"' == substr($params[2][$i], 0, 1)) {
-                $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
-            } else {
-                $paramsAry[$params[1][$i]] = $params[2][$i];
-            }
-        }
-        // for now, just update the nonce value
-        if (!empty($paramsAry['nextnonce'])) {
-            $challenge['nonce'] = $paramsAry['nextnonce'];
-            $challenge['nc']    = 1;
-        }
-    }
+	protected function updateChallenge(&$challenge, $headerValue)
+	{
+		$authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
+					   self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';
+		$paramsAry   = array();
+
+		preg_match_all($authParam, $headerValue, $params);
+		for ($i = 0; $i < count($params[0]); $i++) {
+			if ('"' == substr($params[2][$i], 0, 1)) {
+				$paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
+			} else {
+				$paramsAry[$params[1][$i]] = $params[2][$i];
+			}
+		}
+		// for now, just update the nonce value
+		if (!empty($paramsAry['nextnonce'])) {
+			$challenge['nonce'] = $paramsAry['nextnonce'];
+			$challenge['nc']    = 1;
+		}
+	}
 
    /**
     * Creates a value for [Proxy-]Authorization header when using digest authentication
@@ -669,40 +669,40 @@ 
     * @return   string  value of [Proxy-]Authorization request header
     * @link     http://tools.ietf.org/html/rfc2617#section-3.2.2
     */
-    protected function createDigestResponse($user, $password, $url, &$challenge)
-    {
-        if (false !== ($q = strpos($url, '?')) &&
-            $this->request->getConfig('digest_compat_ie')
-        ) {
-            $url = substr($url, 0, $q);
-        }
-
-        $a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);
-        $a2 = md5($this->request->getMethod() . ':' . $url);
-
-        if (empty($challenge['qop'])) {
-            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);
-        } else {
-            $challenge['cnonce'] = 'Req2.' . rand();
-            if (empty($challenge['nc'])) {
-                $challenge['nc'] = 1;
-            }
-            $nc     = sprintf('%08x', $challenge['nc']++);
-            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .
-                          $challenge['cnonce'] . ':auth:' . $a2);
-        }
-        return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .
-               'realm="' . $challenge['realm'] . '", ' .
-               'nonce="' . $challenge['nonce'] . '", ' .
-               'uri="' . $url . '", ' .
-               'response="' . $digest . '"' .
-               (!empty($challenge['opaque'])?
-                ', opaque="' . $challenge['opaque'] . '"':
-                '') .
-               (!empty($challenge['qop'])?
-                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':
-                '');
-    }
+	protected function createDigestResponse($user, $password, $url, &$challenge)
+	{
+		if (false !== ($q = strpos($url, '?')) &&
+			$this->request->getConfig('digest_compat_ie')
+		) {
+			$url = substr($url, 0, $q);
+		}
+
+		$a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);
+		$a2 = md5($this->request->getMethod() . ':' . $url);
+
+		if (empty($challenge['qop'])) {
+			$digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);
+		} else {
+			$challenge['cnonce'] = 'Req2.' . rand();
+			if (empty($challenge['nc'])) {
+				$challenge['nc'] = 1;
+			}
+			$nc     = sprintf('%08x', $challenge['nc']++);
+			$digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .
+						  $challenge['cnonce'] . ':auth:' . $a2);
+		}
+		return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .
+			   'realm="' . $challenge['realm'] . '", ' .
+			   'nonce="' . $challenge['nonce'] . '", ' .
+			   'uri="' . $url . '", ' .
+			   'response="' . $digest . '"' .
+			   (!empty($challenge['opaque'])?
+				', opaque="' . $challenge['opaque'] . '"':
+				'') .
+			   (!empty($challenge['qop'])?
+				', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':
+				'');
+	}
 
    /**
     * Adds 'Authorization' header (if needed) to request headers array
@@ -712,41 +712,41 @@ 
     * @param    string  request URL (needed for digest authentication)
     * @throws   HTTP_Request2_Exception
     */
-    protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)
-    {
-        if (!($auth = $this->request->getAuth())) {
-            return;
-        }
-        switch ($auth['scheme']) {
-            case HTTP_Request2::AUTH_BASIC:
-                $headers['authorization'] =
-                    'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);
-                break;
-
-            case HTTP_Request2::AUTH_DIGEST:
-                unset($this->serverChallenge);
-                $fullUrl = ('/' == $requestUrl[0])?
-                           $this->request->getUrl()->getScheme() . '://' .
-                            $requestHost . $requestUrl:
-                           $requestUrl;
-                foreach (array_keys(self::$challenges) as $key) {
-                    if ($key == substr($fullUrl, 0, strlen($key))) {
-                        $headers['authorization'] = $this->createDigestResponse(
-                            $auth['user'], $auth['password'],
-                            $requestUrl, self::$challenges[$key]
-                        );
-                        $this->serverChallenge =& self::$challenges[$key];
-                        break;
-                    }
-                }
-                break;
-
-            default:
-                throw new HTTP_Request2_Exception(
-                    "Unknown HTTP authentication scheme '{$auth['scheme']}'"
-                );
-        }
-    }
+	protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)
+	{
+		if (!($auth = $this->request->getAuth())) {
+			return;
+		}
+		switch ($auth['scheme']) {
+			case HTTP_Request2::AUTH_BASIC:
+				$headers['authorization'] =
+					'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);
+				break;
+
+			case HTTP_Request2::AUTH_DIGEST:
+				unset($this->serverChallenge);
+				$fullUrl = ('/' == $requestUrl[0])?
+						   $this->request->getUrl()->getScheme() . '://' .
+							$requestHost . $requestUrl:
+						   $requestUrl;
+				foreach (array_keys(self::$challenges) as $key) {
+					if ($key == substr($fullUrl, 0, strlen($key))) {
+						$headers['authorization'] = $this->createDigestResponse(
+							$auth['user'], $auth['password'],
+							$requestUrl, self::$challenges[$key]
+						);
+						$this->serverChallenge =& self::$challenges[$key];
+						break;
+					}
+				}
+				break;
+
+			default:
+				throw new HTTP_Request2_Exception(
+					"Unknown HTTP authentication scheme '{$auth['scheme']}'"
+				);
+		}
+	}
 
    /**
     * Adds 'Proxy-Authorization' header (if needed) to request headers array
@@ -755,43 +755,43 @@ 
     * @param    string  request URL (needed for digest authentication)
     * @throws   HTTP_Request2_Exception
     */
-    protected function addProxyAuthorizationHeader(&$headers, $requestUrl)
-    {
-        if (!$this->request->getConfig('proxy_host') ||
-            !($user = $this->request->getConfig('proxy_user')) ||
-            (0 == strcasecmp('https', $this->request->getUrl()->getScheme()) &&
-             HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())
-        ) {
-            return;
-        }
-
-        $password = $this->request->getConfig('proxy_password');
-        switch ($this->request->getConfig('proxy_auth_scheme')) {
-            case HTTP_Request2::AUTH_BASIC:
-                $headers['proxy-authorization'] =
-                    'Basic ' . base64_encode($user . ':' . $password);
-                break;
-
-            case HTTP_Request2::AUTH_DIGEST:
-                unset($this->proxyChallenge);
-                $proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .
-                            ':' . $this->request->getConfig('proxy_port');
-                if (!empty(self::$challenges[$proxyUrl])) {
-                    $headers['proxy-authorization'] = $this->createDigestResponse(
-                        $user, $password,
-                        $requestUrl, self::$challenges[$proxyUrl]
-                    );
-                    $this->proxyChallenge =& self::$challenges[$proxyUrl];
-                }
-                break;
-
-            default:
-                throw new HTTP_Request2_Exception(
-                    "Unknown HTTP authentication scheme '" .
-                    $this->request->getConfig('proxy_auth_scheme') . "'"
-                );
-        }
-    }
+	protected function addProxyAuthorizationHeader(&$headers, $requestUrl)
+	{
+		if (!$this->request->getConfig('proxy_host') ||
+			!($user = $this->request->getConfig('proxy_user')) ||
+			(0 == strcasecmp('https', $this->request->getUrl()->getScheme()) &&
+			 HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())
+		) {
+			return;
+		}
+
+		$password = $this->request->getConfig('proxy_password');
+		switch ($this->request->getConfig('proxy_auth_scheme')) {
+			case HTTP_Request2::AUTH_BASIC:
+				$headers['proxy-authorization'] =
+					'Basic ' . base64_encode($user . ':' . $password);
+				break;
+
+			case HTTP_Request2::AUTH_DIGEST:
+				unset($this->proxyChallenge);
+				$proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .
+							':' . $this->request->getConfig('proxy_port');
+				if (!empty(self::$challenges[$proxyUrl])) {
+					$headers['proxy-authorization'] = $this->createDigestResponse(
+						$user, $password,
+						$requestUrl, self::$challenges[$proxyUrl]
+					);
+					$this->proxyChallenge =& self::$challenges[$proxyUrl];
+				}
+				break;
+
+			default:
+				throw new HTTP_Request2_Exception(
+					"Unknown HTTP authentication scheme '" .
+					$this->request->getConfig('proxy_auth_scheme') . "'"
+				);
+		}
+	}
 
 
    /**
@@ -800,88 +800,88 @@ 
     * @return   string
     * @throws   HTTP_Request2_Exception
     */
-    protected function prepareHeaders()
-    {
-        $headers = $this->request->getHeaders();
-        $url     = $this->request->getUrl();
-        $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
-        $host    = $url->getHost();
-
-        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;
-        if (($port = $url->getPort()) && $port != $defaultPort || $connect) {
-            $host .= ':' . (empty($port)? $defaultPort: $port);
-        }
-        // Do not overwrite explicitly set 'Host' header, see bug #16146
-        if (!isset($headers['host'])) {
-            $headers['host'] = $host;
-        }
-
-        if ($connect) {
-            $requestUrl = $host;
-
-        } else {
-            if (!$this->request->getConfig('proxy_host') ||
-                0 == strcasecmp($url->getScheme(), 'https')
-            ) {
-                $requestUrl = '';
-            } else {
-                $requestUrl = $url->getScheme() . '://' . $host;
-            }
-            $path        = $url->getPath();
-            $query       = $url->getQuery();
-            $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);
-        }
-
-        if ('1.1' == $this->request->getConfig('protocol_version') &&
-            extension_loaded('zlib') && !isset($headers['accept-encoding'])
-        ) {
-            $headers['accept-encoding'] = 'gzip, deflate';
-        }
-
-        $this->addAuthorizationHeader($headers, $host, $requestUrl);
-        $this->addProxyAuthorizationHeader($headers, $requestUrl);
-        $this->calculateRequestLength($headers);
-
-        $headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .
-                      $this->request->getConfig('protocol_version') . "\r\n";
-        foreach ($headers as $name => $value) {
-            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
-            $headersStr   .= $canonicalName . ': ' . $value . "\r\n";
-        }
-        return $headersStr . "\r\n";
-    }
+	protected function prepareHeaders()
+	{
+		$headers = $this->request->getHeaders();
+		$url     = $this->request->getUrl();
+		$connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
+		$host    = $url->getHost();
+
+		$defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;
+		if (($port = $url->getPort()) && $port != $defaultPort || $connect) {
+			$host .= ':' . (empty($port)? $defaultPort: $port);
+		}
+		// Do not overwrite explicitly set 'Host' header, see bug #16146
+		if (!isset($headers['host'])) {
+			$headers['host'] = $host;
+		}
+
+		if ($connect) {
+			$requestUrl = $host;
+
+		} else {
+			if (!$this->request->getConfig('proxy_host') ||
+				0 == strcasecmp($url->getScheme(), 'https')
+			) {
+				$requestUrl = '';
+			} else {
+				$requestUrl = $url->getScheme() . '://' . $host;
+			}
+			$path        = $url->getPath();
+			$query       = $url->getQuery();
+			$requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);
+		}
+
+		if ('1.1' == $this->request->getConfig('protocol_version') &&
+			extension_loaded('zlib') && !isset($headers['accept-encoding'])
+		) {
+			$headers['accept-encoding'] = 'gzip, deflate';
+		}
+
+		$this->addAuthorizationHeader($headers, $host, $requestUrl);
+		$this->addProxyAuthorizationHeader($headers, $requestUrl);
+		$this->calculateRequestLength($headers);
+
+		$headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .
+					  $this->request->getConfig('protocol_version') . "\r\n";
+		foreach ($headers as $name => $value) {
+			$canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
+			$headersStr   .= $canonicalName . ': ' . $value . "\r\n";
+		}
+		return $headersStr . "\r\n";
+	}
 
    /**
     * Sends the request body
     *
     * @throws   HTTP_Request2_Exception
     */
-    protected function writeBody()
-    {
-        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
-            0 == $this->contentLength
-        ) {
-            return;
-        }
-
-        $position   = 0;
-        $bufferSize = $this->request->getConfig('buffer_size');
-        while ($position < $this->contentLength) {
-            if (is_string($this->requestBody)) {
-                $str = substr($this->requestBody, $position, $bufferSize);
-            } elseif (is_resource($this->requestBody)) {
-                $str = fread($this->requestBody, $bufferSize);
-            } else {
-                $str = $this->requestBody->read($bufferSize);
-            }
-            if (false === @fwrite($this->socket, $str, strlen($str))) {
-                throw new HTTP_Request2_Exception('Error writing request');
-            }
-            // Provide the length of written string to the observer, request #7630
-            $this->request->setLastEvent('sentBodyPart', strlen($str));
-            $position += strlen($str);
-        }
-    }
+	protected function writeBody()
+	{
+		if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
+			0 == $this->contentLength
+		) {
+			return;
+		}
+
+		$position   = 0;
+		$bufferSize = $this->request->getConfig('buffer_size');
+		while ($position < $this->contentLength) {
+			if (is_string($this->requestBody)) {
+				$str = substr($this->requestBody, $position, $bufferSize);
+			} elseif (is_resource($this->requestBody)) {
+				$str = fread($this->requestBody, $bufferSize);
+			} else {
+				$str = $this->requestBody->read($bufferSize);
+			}
+			if (false === @fwrite($this->socket, $str, strlen($str))) {
+				throw new HTTP_Request2_Exception('Error writing request');
+			}
+			// Provide the length of written string to the observer, request #7630
+			$this->request->setLastEvent('sentBodyPart', strlen($str));
+			$position += strlen($str);
+		}
+	}
 
    /**
     * Reads the remote server's response
@@ -889,70 +889,70 @@ 
     * @return   HTTP_Request2_Response
     * @throws   HTTP_Request2_Exception
     */
-    protected function readResponse()
-    {
-        $bufferSize = $this->request->getConfig('buffer_size');
-
-        do {
-            $response = new HTTP_Request2_Response($this->readLine($bufferSize), true);
-            do {
-                $headerLine = $this->readLine($bufferSize);
-                $response->parseHeaderLine($headerLine);
-            } while ('' != $headerLine);
-        } while (in_array($response->getStatus(), array(100, 101)));
-
-        $this->request->setLastEvent('receivedHeaders', $response);
-
-        // No body possible in such responses
-        if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod() ||
-            (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
-             200 <= $response->getStatus() && 300 > $response->getStatus()) ||
-            in_array($response->getStatus(), array(204, 304))
-        ) {
-            return $response;
-        }
-
-        $chunked = 'chunked' == $response->getHeader('transfer-encoding');
-        $length  = $response->getHeader('content-length');
-        $hasBody = false;
-        if ($chunked || null === $length || 0 < intval($length)) {
-            // RFC 2616, section 4.4:
-            // 3. ... If a message is received with both a
-            // Transfer-Encoding header field and a Content-Length header field,
-            // the latter MUST be ignored.
-            $toRead = ($chunked || null === $length)? null: $length;
-            $this->chunkLength = 0;
-
-            while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {
-                if ($chunked) {
-                    $data = $this->readChunked($bufferSize);
-                } elseif (is_null($toRead)) {
-                    $data = $this->fread($bufferSize);
-                } else {
-                    $data    = $this->fread(min($toRead, $bufferSize));
-                    $toRead -= strlen($data);
-                }
-                if ('' == $data && (!$this->chunkLength || feof($this->socket))) {
-                    break;
-                }
-
-                $hasBody = true;
-                if ($this->request->getConfig('store_body')) {
-                    $response->appendBody($data);
-                }
-                if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {
-                    $this->request->setLastEvent('receivedEncodedBodyPart', $data);
-                } else {
-                    $this->request->setLastEvent('receivedBodyPart', $data);
-                }
-            }
-        }
-
-        if ($hasBody) {
-            $this->request->setLastEvent('receivedBody', $response);
-        }
-        return $response;
-    }
+	protected function readResponse()
+	{
+		$bufferSize = $this->request->getConfig('buffer_size');
+
+		do {
+			$response = new HTTP_Request2_Response($this->readLine($bufferSize), true);
+			do {
+				$headerLine = $this->readLine($bufferSize);
+				$response->parseHeaderLine($headerLine);
+			} while ('' != $headerLine);
+		} while (in_array($response->getStatus(), array(100, 101)));
+
+		$this->request->setLastEvent('receivedHeaders', $response);
+
+		// No body possible in such responses
+		if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod() ||
+			(HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
+			 200 <= $response->getStatus() && 300 > $response->getStatus()) ||
+			in_array($response->getStatus(), array(204, 304))
+		) {
+			return $response;
+		}
+
+		$chunked = 'chunked' == $response->getHeader('transfer-encoding');
+		$length  = $response->getHeader('content-length');
+		$hasBody = false;
+		if ($chunked || null === $length || 0 < intval($length)) {
+			// RFC 2616, section 4.4:
+			// 3. ... If a message is received with both a
+			// Transfer-Encoding header field and a Content-Length header field,
+			// the latter MUST be ignored.
+			$toRead = ($chunked || null === $length)? null: $length;
+			$this->chunkLength = 0;
+
+			while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {
+				if ($chunked) {
+					$data = $this->readChunked($bufferSize);
+				} elseif (is_null($toRead)) {
+					$data = $this->fread($bufferSize);
+				} else {
+					$data    = $this->fread(min($toRead, $bufferSize));
+					$toRead -= strlen($data);
+				}
+				if ('' == $data && (!$this->chunkLength || feof($this->socket))) {
+					break;
+				}
+
+				$hasBody = true;
+				if ($this->request->getConfig('store_body')) {
+					$response->appendBody($data);
+				}
+				if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {
+					$this->request->setLastEvent('receivedEncodedBodyPart', $data);
+				} else {
+					$this->request->setLastEvent('receivedBodyPart', $data);
+				}
+			}
+		}
+
+		if ($hasBody) {
+			$this->request->setLastEvent('receivedBody', $response);
+		}
+		return $response;
+	}
 
    /**
     * Reads until either the end of the socket or a newline, whichever comes first
@@ -964,27 +964,27 @@ 
     * @return   Available data up to the newline (not including newline)
     * @throws   HTTP_Request2_Exception     In case of timeout
     */
-    protected function readLine($bufferSize)
-    {
-        $line = '';
-        while (!feof($this->socket)) {
-            if ($this->deadline) {
-                stream_set_timeout($this->socket, max($this->deadline - time(), 1));
-            }
-            $line .= @fgets($this->socket, $bufferSize);
-            $info  = stream_get_meta_data($this->socket);
-            if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
-                $reason = $this->deadline
-                          ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
-                          : 'due to default_socket_timeout php.ini setting';
-                throw new HTTP_Request2_Exception("Request timed out {$reason}");
-            }
-            if (substr($line, -1) == "\n") {
-                return rtrim($line, "\r\n");
-            }
-        }
-        return $line;
-    }
+	protected function readLine($bufferSize)
+	{
+		$line = '';
+		while (!feof($this->socket)) {
+			if ($this->deadline) {
+				stream_set_timeout($this->socket, max($this->deadline - time(), 1));
+			}
+			$line .= @fgets($this->socket, $bufferSize);
+			$info  = stream_get_meta_data($this->socket);
+			if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
+				$reason = $this->deadline
+						  ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
+						  : 'due to default_socket_timeout php.ini setting';
+				throw new HTTP_Request2_Exception("Request timed out {$reason}");
+			}
+			if (substr($line, -1) == "\n") {
+				return rtrim($line, "\r\n");
+			}
+		}
+		return $line;
+	}
 
    /**
     * Wrapper around fread(), handles global request timeout
@@ -993,21 +993,21 @@ 
     * @return   Data read from socket
     * @throws   HTTP_Request2_Exception     In case of timeout
     */
-    protected function fread($length)
-    {
-        if ($this->deadline) {
-            stream_set_timeout($this->socket, max($this->deadline - time(), 1));
-        }
-        $data = fread($this->socket, $length);
-        $info = stream_get_meta_data($this->socket);
-        if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
-            $reason = $this->deadline
-                      ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
-                      : 'due to default_socket_timeout php.ini setting';
-            throw new HTTP_Request2_Exception("Request timed out {$reason}");
-        }
-        return $data;
-    }
+	protected function fread($length)
+	{
+		if ($this->deadline) {
+			stream_set_timeout($this->socket, max($this->deadline - time(), 1));
+		}
+		$data = fread($this->socket, $length);
+		$info = stream_get_meta_data($this->socket);
+		if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
+			$reason = $this->deadline
+					  ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
+					  : 'due to default_socket_timeout php.ini setting';
+			throw new HTTP_Request2_Exception("Request timed out {$reason}");
+		}
+		return $data;
+	}
 
    /**
     * Reads a part of response body encoded with chunked Transfer-Encoding
@@ -1016,31 +1016,31 @@ 
     * @return   string
     * @throws   HTTP_Request2_Exception
     */
-    protected function readChunked($bufferSize)
-    {
-        // at start of the next chunk?
-        if (0 == $this->chunkLength) {
-            $line = $this->readLine($bufferSize);
-            if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
-                throw new HTTP_Request2_Exception(
-                    "Cannot decode chunked response, invalid chunk length '{$line}'"
-                );
-            } else {
-                $this->chunkLength = hexdec($matches[1]);
-                // Chunk with zero length indicates the end
-                if (0 == $this->chunkLength) {
-                    $this->readLine($bufferSize);
-                    return '';
-                }
-            }
-        }
-        $data = $this->fread(min($this->chunkLength, $bufferSize));
-        $this->chunkLength -= strlen($data);
-        if (0 == $this->chunkLength) {
-            $this->readLine($bufferSize); // Trailing CRLF
-        }
-        return $data;
-    }
+	protected function readChunked($bufferSize)
+	{
+		// at start of the next chunk?
+		if (0 == $this->chunkLength) {
+			$line = $this->readLine($bufferSize);
+			if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
+				throw new HTTP_Request2_Exception(
+					"Cannot decode chunked response, invalid chunk length '{$line}'"
+				);
+			} else {
+				$this->chunkLength = hexdec($matches[1]);
+				// Chunk with zero length indicates the end
+				if (0 == $this->chunkLength) {
+					$this->readLine($bufferSize);
+					return '';
+				}
+			}
+		}
+		$data = $this->fread(min($this->chunkLength, $bufferSize));
+		$this->chunkLength -= strlen($data);
+		if (0 == $this->chunkLength) {
+			$this->readLine($bufferSize); // Trailing CRLF
+		}
+		return $data;
+	}
 }
 
 ?>
\ No newline at end of file

Spacing +65 added lines, -68 removed lines

@@ -162,8 +162,8 @@ 
 
             if ($this->deadline && time() > $this->deadline) {
                 throw new HTTP_Request2_Exception(
-                    'Request timed out after ' .
-                    $request->getConfig('timeout') . ' second(s)'
+                    'Request timed out after '.
+                    $request->getConfig('timeout').' second(s)'
                 );
             }
 
@@ -216,7 +216,7 @@ 
         $headers = $this->request->getHeaders();
         $reqHost = $this->request->getUrl()->getHost();
         if (!($reqPort = $this->request->getUrl()->getPort())) {
-            $reqPort = $secure? 443: 80;
+            $reqPort = $secure ? 443 : 80;
         }
 
         if ($host = $this->request->getConfig('proxy_host')) {
@@ -253,7 +253,7 @@ 
                       empty($headers['connection'])) ||
                      (!empty($headers['connection']) &&
                       'Keep-Alive' == $headers['connection']);
-        $host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;
+        $host = ((!$secure || $proxy) ? 'tcp://' : 'ssl://').$host;
 
         $options = array();
         if ($secure || $tunnel) {
@@ -273,9 +273,9 @@ 
 
         // Changing SSL context options after connection is established does *not*
         // work, we need a new connection if options change
-        $remote    = $host . ':' . $port;
-        $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .
-                     (empty($options)? '': ':' . serialize($options));
+        $remote    = $host.':'.$port;
+        $socketKey = $remote.(($secure && $proxy) ? "->{$reqHost}:{$reqPort}" : '').
+                     (empty($options) ? '' : ':'.serialize($options));
         unset($this->socket);
 
         // We use persistent connections and have a connected socket?
@@ -283,14 +283,14 @@ 
         if ($keepAlive && !empty(self::$sockets[$socketKey]) &&
             !feof(self::$sockets[$socketKey])
         ) {
-            $this->socket =& self::$sockets[$socketKey];
+            $this->socket = & self::$sockets[$socketKey];
 
         } elseif ($secure && $proxy && !$tunnel) {
             $this->establishTunnel();
             $this->request->setLastEvent(
                 'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"
             );
-            self::$sockets[$socketKey] =& $this->socket;
+            self::$sockets[$socketKey] = & $this->socket;
 
         } else {
             // Set SSL context options if doing HTTPS request or creating a tunnel
@@ -313,7 +313,7 @@ 
                 );
             }
             $this->request->setLastEvent('connect', $remote);
-            self::$sockets[$socketKey] =& $this->socket;
+            self::$sockets[$socketKey] = & $this->socket;
         }
         return $keepAlive;
     }
@@ -340,8 +340,8 @@ 
         // Need any successful (2XX) response
         if (200 > $response->getStatus() || 300 <= $response->getStatus()) {
             throw new HTTP_Request2_Exception(
-                'Failed to connect via HTTPS proxy. Proxy response: ' .
-                $response->getStatus() . ' ' . $response->getReasonPhrase()
+                'Failed to connect via HTTPS proxy. Proxy response: '.
+                $response->getStatus().' '.$response->getReasonPhrase()
             );
         }
         $this->socket = $donor->socket;
@@ -421,7 +421,7 @@ 
         if (0 == $this->redirectCountdown) {
             // Copying cURL behaviour
             throw new HTTP_Request2_Exception(
-                'Maximum (' . $request->getConfig('max_redirects') . ') redirects followed'
+                'Maximum ('.$request->getConfig('max_redirects').') redirects followed'
             );
         }
         $redirectUrl = new Net_URL2(
@@ -433,7 +433,7 @@ 
             && !in_array($redirectUrl->getScheme(), array('http', 'https'))
         ) {
             throw new HTTP_Request2_Exception(
-                'Refusing to redirect to a non-HTTP URL ' . $redirectUrl->__toString()
+                'Refusing to redirect to a non-HTTP URL '.$redirectUrl->__toString()
             );
         }
         // Theoretically URL should be absolute (see http://tools.ietf.org/html/rfc2616#section-14.30),
@@ -485,12 +485,12 @@ 
 
         $url    = $this->request->getUrl();
         $scheme = $url->getScheme();
-        $host   = $scheme . '://' . $url->getHost();
+        $host   = $scheme.'://'.$url->getHost();
         if ($port = $url->getPort()) {
             if ((0 == strcasecmp($scheme, 'http') && 80 != $port) ||
                 (0 == strcasecmp($scheme, 'https') && 443 != $port)
             ) {
-                $host .= ':' . $port;
+                $host .= ':'.$port;
             }
         }
 
@@ -499,12 +499,12 @@ 
             foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {
                 // don't bother with different servers
                 if ('/' == substr($prefix, 0, 1)) {
-                    $prefixes[] = $host . $prefix;
+                    $prefixes[] = $host.$prefix;
                 }
             }
         }
         if (empty($prefixes)) {
-            $prefixes = array($host . '/');
+            $prefixes = array($host.'/');
         }
 
         $ret = true;
@@ -515,7 +515,7 @@ 
                 // probably credentials are invalid
                 $ret = false;
             }
-            self::$challenges[$prefix] =& $challenge;
+            self::$challenges[$prefix] = & $challenge;
         }
         return $ret;
     }
@@ -546,8 +546,8 @@ 
             return false;
         }
 
-        $key = 'proxy://' . $this->request->getConfig('proxy_host') .
-               ':' . $this->request->getConfig('proxy_port');
+        $key = 'proxy://'.$this->request->getConfig('proxy_host').
+               ':'.$this->request->getConfig('proxy_port');
 
         if (!empty(self::$challenges[$key]) &&
             (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
@@ -590,14 +590,14 @@ 
     */
     protected function parseDigestChallenge($headerValue)
     {
-        $authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';
+        $authParam   = '('.self::REGEXP_TOKEN.')\\s*=\\s*('.
+                       self::REGEXP_TOKEN.'|'.self::REGEXP_QUOTED_STRING.')';
         $challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";
         if (!preg_match($challenge, $headerValue, $matches)) {
             return false;
         }
 
-        preg_match_all('!' . $authParam . '!', $matches[0], $params);
+        preg_match_all('!'.$authParam.'!', $matches[0], $params);
         $paramsAry   = array();
         $knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',
                              'algorithm', 'qop');
@@ -616,14 +616,14 @@ 
             !in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))
         ) {
             throw new HTTP_Request2_Exception(
-                "Only 'auth' qop is currently supported in digest authentication, " .
+                "Only 'auth' qop is currently supported in digest authentication, ".
                 "server requested '{$paramsAry['qop']}'"
             );
         }
         // we only support algorithm=MD5
         if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {
             throw new HTTP_Request2_Exception(
-                "Only 'MD5' algorithm is currently supported in digest authentication, " .
+                "Only 'MD5' algorithm is currently supported in digest authentication, ".
                 "server requested '{$paramsAry['algorithm']}'"
             );
         }
@@ -640,8 +640,8 @@ 
     */
     protected function updateChallenge(&$challenge, $headerValue)
     {
-        $authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';
+        $authParam   = '!('.self::REGEXP_TOKEN.')\\s*=\\s*('.
+                       self::REGEXP_TOKEN.'|'.self::REGEXP_QUOTED_STRING.')!';
         $paramsAry   = array();
 
         preg_match_all($authParam, $headerValue, $params);
@@ -677,31 +677,29 @@ 
             $url = substr($url, 0, $q);
         }
 
-        $a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);
-        $a2 = md5($this->request->getMethod() . ':' . $url);
+        $a1 = md5($user.':'.$challenge['realm'].':'.$password);
+        $a2 = md5($this->request->getMethod().':'.$url);
 
         if (empty($challenge['qop'])) {
-            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);
+            $digest = md5($a1.':'.$challenge['nonce'].':'.$a2);
         } else {
-            $challenge['cnonce'] = 'Req2.' . rand();
+            $challenge['cnonce'] = 'Req2.'.rand();
             if (empty($challenge['nc'])) {
                 $challenge['nc'] = 1;
             }
             $nc     = sprintf('%08x', $challenge['nc']++);
-            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .
-                          $challenge['cnonce'] . ':auth:' . $a2);
+            $digest = md5($a1.':'.$challenge['nonce'].':'.$nc.':'.
+                          $challenge['cnonce'].':auth:'.$a2);
         }
-        return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .
-               'realm="' . $challenge['realm'] . '", ' .
-               'nonce="' . $challenge['nonce'] . '", ' .
-               'uri="' . $url . '", ' .
-               'response="' . $digest . '"' .
-               (!empty($challenge['opaque'])?
-                ', opaque="' . $challenge['opaque'] . '"':
-                '') .
-               (!empty($challenge['qop'])?
-                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':
-                '');
+        return 'Digest username="'.str_replace(array('\\', '"'), array('\\\\', '\\"'), $user).'", '.
+               'realm="'.$challenge['realm'].'", '.
+               'nonce="'.$challenge['nonce'].'", '.
+               'uri="'.$url.'", '.
+               'response="'.$digest.'"'.
+               (!empty($challenge['opaque']) ?
+                ', opaque="'.$challenge['opaque'].'"' : '').
+               (!empty($challenge['qop']) ?
+                ', qop="auth", nc='.$nc.', cnonce="'.$challenge['cnonce'].'"' : '');
     }
 
    /**
@@ -720,22 +718,21 @@ 
         switch ($auth['scheme']) {
             case HTTP_Request2::AUTH_BASIC:
                 $headers['authorization'] =
-                    'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);
+                    'Basic '.base64_encode($auth['user'].':'.$auth['password']);
                 break;
 
             case HTTP_Request2::AUTH_DIGEST:
                 unset($this->serverChallenge);
-                $fullUrl = ('/' == $requestUrl[0])?
-                           $this->request->getUrl()->getScheme() . '://' .
-                            $requestHost . $requestUrl:
-                           $requestUrl;
+                $fullUrl = ('/' == $requestUrl[0]) ?
+                           $this->request->getUrl()->getScheme().'://'.
+                            $requestHost.$requestUrl : $requestUrl;
                 foreach (array_keys(self::$challenges) as $key) {
                     if ($key == substr($fullUrl, 0, strlen($key))) {
                         $headers['authorization'] = $this->createDigestResponse(
                             $auth['user'], $auth['password'],
                             $requestUrl, self::$challenges[$key]
                         );
-                        $this->serverChallenge =& self::$challenges[$key];
+                        $this->serverChallenge = & self::$challenges[$key];
                         break;
                     }
                 }
@@ -769,26 +766,26 @@ 
         switch ($this->request->getConfig('proxy_auth_scheme')) {
             case HTTP_Request2::AUTH_BASIC:
                 $headers['proxy-authorization'] =
-                    'Basic ' . base64_encode($user . ':' . $password);
+                    'Basic '.base64_encode($user.':'.$password);
                 break;
 
             case HTTP_Request2::AUTH_DIGEST:
                 unset($this->proxyChallenge);
-                $proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .
-                            ':' . $this->request->getConfig('proxy_port');
+                $proxyUrl = 'proxy://'.$this->request->getConfig('proxy_host').
+                            ':'.$this->request->getConfig('proxy_port');
                 if (!empty(self::$challenges[$proxyUrl])) {
                     $headers['proxy-authorization'] = $this->createDigestResponse(
                         $user, $password,
                         $requestUrl, self::$challenges[$proxyUrl]
                     );
-                    $this->proxyChallenge =& self::$challenges[$proxyUrl];
+                    $this->proxyChallenge = & self::$challenges[$proxyUrl];
                 }
                 break;
 
             default:
                 throw new HTTP_Request2_Exception(
-                    "Unknown HTTP authentication scheme '" .
-                    $this->request->getConfig('proxy_auth_scheme') . "'"
+                    "Unknown HTTP authentication scheme '".
+                    $this->request->getConfig('proxy_auth_scheme')."'"
                 );
         }
     }
@@ -807,9 +804,9 @@ 
         $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
         $host    = $url->getHost();
 
-        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;
+        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https') ? 443 : 80;
         if (($port = $url->getPort()) && $port != $defaultPort || $connect) {
-            $host .= ':' . (empty($port)? $defaultPort: $port);
+            $host .= ':'.(empty($port) ? $defaultPort : $port);
         }
         // Do not overwrite explicitly set 'Host' header, see bug #16146
         if (!isset($headers['host'])) {
@@ -825,11 +822,11 @@ 
             ) {
                 $requestUrl = '';
             } else {
-                $requestUrl = $url->getScheme() . '://' . $host;
+                $requestUrl = $url->getScheme().'://'.$host;
             }
             $path        = $url->getPath();
             $query       = $url->getQuery();
-            $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);
+            $requestUrl .= (empty($path) ? '/' : $path).(empty($query) ? '' : '?'.$query);
         }
 
         if ('1.1' == $this->request->getConfig('protocol_version') &&
@@ -842,13 +839,13 @@ 
         $this->addProxyAuthorizationHeader($headers, $requestUrl);
         $this->calculateRequestLength($headers);
 
-        $headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .
-                      $this->request->getConfig('protocol_version') . "\r\n";
+        $headersStr = $this->request->getMethod().' '.$requestUrl.' HTTP/'.
+                      $this->request->getConfig('protocol_version')."\r\n";
         foreach ($headers as $name => $value) {
             $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
-            $headersStr   .= $canonicalName . ': ' . $value . "\r\n";
+            $headersStr   .= $canonicalName.': '.$value."\r\n";
         }
-        return $headersStr . "\r\n";
+        return $headersStr."\r\n";
     }
 
    /**
@@ -920,7 +917,7 @@ 
             // 3. ... If a message is received with both a
             // Transfer-Encoding header field and a Content-Length header field,
             // the latter MUST be ignored.
-            $toRead = ($chunked || null === $length)? null: $length;
+            $toRead = ($chunked || null === $length) ? null: $length;
             $this->chunkLength = 0;
 
             while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {
@@ -975,7 +972,7 @@ 
             $info  = stream_get_meta_data($this->socket);
             if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
                 $reason = $this->deadline
-                          ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
+                          ? 'after '.$this->request->getConfig('timeout').' second(s)'
                           : 'due to default_socket_timeout php.ini setting';
                 throw new HTTP_Request2_Exception("Request timed out {$reason}");
             }
@@ -1002,7 +999,7 @@ 
         $info = stream_get_meta_data($this->socket);
         if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
             $reason = $this->deadline
-                      ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
+                      ? 'after '.$this->request->getConfig('timeout').' second(s)'
                       : 'due to default_socket_timeout php.ini setting';
             throw new HTTP_Request2_Exception("Request timed out {$reason}");
         }