Merge branch 'sign_v4'

Author: racklin

S3.php

@@ -605,7 +605,7 @@ public static function putBucket($bucket, $acl = self::ACL_PRIVATE, $location =
 
 		if ($location === false) $location = self::getRegion();
 
-		if ($location !== false)
+		if ($location !== false && $location !== "us-east-1")
 		{
 			$dom = new DOMDocument;
 			$createBucketConfiguration = $dom->createElement('CreateBucketConfiguration');
@@ -1796,11 +1796,13 @@ private static function __getCloudFrontDistributionConfigXML($bucket, $enabled,
 		if ($comment !== '') $distributionConfig->appendChild($dom->createElement('Comment', $comment));
 		$distributionConfig->appendChild($dom->createElement('Enabled', $enabled ? 'true' : 'false'));
 
-		$trusted = $dom->createElement('TrustedSigners');
-		foreach ($trustedSigners as $id => $type)
-			$trusted->appendChild($id !== '' ? $dom->createElement($type, $id) : $dom->createElement($type));
-		$distributionConfig->appendChild($trusted);
-
+		if (!empty($trustedSigners))
+		{
+			$trusted = $dom->createElement('TrustedSigners');
+			foreach ($trustedSigners as $id => $type)
+				$trusted->appendChild($id !== '' ? $dom->createElement($type, $id) : $dom->createElement($type));
+			$distributionConfig->appendChild($trusted);
+		}
 		$dom->appendChild($distributionConfig);
 		//var_dump($dom->saveXML());
 		return $dom->saveXML();
@@ -2042,7 +2044,8 @@ public static function __getSignatureV4($aHeaders, $headers, $method='GET', $uri
 
 		// CanonicalRequests
 		$amzRequests[] = $method;
-		$amzRequests[] = $uri;
+		$uriQmPos = strpos($uri, '?'); 
+		$amzRequests[] = ($uriQmPos === false ? $uri : substr($uri, 0, $uriQmPos));
 		$amzRequests[] = http_build_query($parameters);
 		// add header as string to requests
 		foreach ( $amzHeaders as $k => $v ) {