Fix broken setProxy() params

Author: tpyo

S3.php

@@ -262,7 +262,7 @@ public static function setSSLAuth($sslCert = null, $sslKey = null, $sslCACert =
 	*/
 	public static function setProxy($host, $user = null, $pass = null, $type = CURLPROXY_SOCKS5)
 	{
-		self::$proxy = array('host' => $host, 'type' => $type, 'user' => null, 'pass' => 'null');
+		self::$proxy = array('host' => $host, 'type' => $type, 'user' => $user, 'pass' => $pass);
 	}
 
 
@@ -1541,7 +1541,8 @@ public static function invalidateDistribution($distributionId, $paths)
 	* @param int $callerReference
 	* @return string
 	*/
-	private static function __getCloudFrontInvalidationBatchXML($paths, $callerReference = '0') {
+	private static function __getCloudFrontInvalidationBatchXML($paths, $callerReference = '0')
+	{
 		$dom = new DOMDocument('1.0', 'UTF-8');
 		$dom->formatOutput = true;
 		$invalidationBatch = $dom->createElement('InvalidationBatch');
@@ -1892,34 +1893,42 @@ final class S3Request
 	 * @var array
 	 * @access private
 	 */
-	private $amzHeaders = array(), $headers = array(
+	private $amzHeaders = array();
+
+	/**
+	 * HTTP request headers
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $headers = array(
 		'Host' => '', 'Date' => '', 'Content-MD5' => '', 'Content-Type' => ''
 	);
-	
+
 	/**
 	 * Use HTTP PUT?
 	 *
 	 * @var bool
 	 * @access public
 	 */
 	public $fp = false;
-	
+
 	/**
 	 * PUT file size
 	 *
 	 * @var int
 	 * @access public
 	 */
 	public $size = 0;
-	
+
 	/**
 	 * PUT post fields
 	 *
 	 * @var array
 	 * @access public
 	 */
 	public $data = false;
-	
+
 	/**
 	 * S3 request respone
 	 *