Use endpoint for getAuthenticatedURL

tpyo · tpyo · commit a938ec813cff · 2013-06-12T17:20:05.000+02:00
diff --git a/S3.php b/S3.php
@@ -1117,7 +1117,7 @@ public static function getAuthenticatedURL($bucket, $uri, $lifetime, $hostBucket
 		$uri = str_replace(array('%2F', '%2B'), array('/', '+'), rawurlencode($uri));
 		return sprintf(($https ? 'https' : 'http').'://%s/%s?AWSAccessKeyId=%s&Expires=%u&Signature=%s',
 		// $hostBucket ? $bucket : $bucket.'.s3.amazonaws.com', $uri, self::$__accessKey, $expires,
-		$hostBucket ? $bucket : 's3.amazonaws.com/'.$bucket, $uri, self::$__accessKey, $expires,
+		$hostBucket ? $bucket : self::$endpoint.'/'.$bucket, $uri, self::$__accessKey, $expires,
 		urlencode(self::__getHash("GET\n\n\n{$expires}\n/{$bucket}/{$uri}")));
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1117,7 +1117,7 @@ public static function getAuthenticatedURL($bucket, $uri, $lifetime, $hostBucket`
`1117`	`1117`	`$uri = str_replace(array('%2F', '%2B'), array('/', '+'), rawurlencode($uri));`
`1118`	`1118`	`return sprintf(($https ? 'https' : 'http').'://%s/%s?AWSAccessKeyId=%s&Expires=%u&Signature=%s',`
`1119`	`1119`	`// $hostBucket ? $bucket : $bucket.'.s3.amazonaws.com', $uri, self::$__accessKey, $expires,`
`1120`		`- $hostBucket ? $bucket : 's3.amazonaws.com/'.$bucket, $uri, self::$__accessKey, $expires,`
	`1120`	`+ $hostBucket ? $bucket : self::$endpoint.'/'.$bucket, $uri, self::$__accessKey, $expires,`
`1121`	`1121`	`urlencode(self::__getHash("GET\n\n\n{$expires}\n/{$bucket}/{$uri}")));`
`1122`	`1122`	`}`
`1123`	`1123`