Merge branch 'sign_v4'

Author: racklin

S3.php

@@ -2004,10 +2004,9 @@ private static function __getHash($string)
 	* @param string $method 
 	* @param string $uri
 	* @param string $data
-	* @param array $parameters
 	* @return array $headers
 	*/
-	public static function __getSignatureV4($aHeaders, $headers, $method='GET', $uri='', $data = '', $parameters=array())
+	public static function __getSignatureV4($aHeaders, $headers, $method='GET', $uri='', $data = '')
 	{		
 		$service = 's3';
 		$region = S3::getRegion();
@@ -2034,10 +2033,17 @@ public static function __getSignatureV4($aHeaders, $headers, $method='GET', $uri
 		// payload
 		$payloadHash = isset($amzHeaders['x-amz-content-sha256']) ? $amzHeaders['x-amz-content-sha256'] :  hash('sha256', $data);
 
+		// parameters
+		$parameters = array();
+		if (strpos($uri, '?')) {
+			list ($uri, $query_str) = @explode("?", $uri);
+			parse_str($query_str, $parameters);
+		}
+
 		// CanonicalRequests
 		$amzRequests[] = $method;
 		$amzRequests[] = $uri;
-		$amzRequests[] = http_build_query($parameters);		
+		$amzRequests[] = http_build_query($parameters);
 		// add header as string to requests
 		foreach ( $amzHeaders as $k => $v ) {
 			$amzRequests[] = $k . ':' . $v;
@@ -2392,8 +2398,7 @@ public function getResponse()
 						$this->headers, 
 						$this->verb, 
 						$this->uri,
-						$this->data,
-						$this->parameters
+						$this->data
 					);
 					foreach ($amzHeaders as $k => $v) {
 						$headers[] = $k .': '. $v;