https://www.mediawiki.org/wiki/Special:Code/MediaWiki/103022
Revision: 103022
Author: reedy
Date: 2011-11-14 20:13:58 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------
aws-sdk Changelog: 1.4.7 "Yuna"
Modified Paths:
--------------
trunk/extensions/OpenStackManager/aws-sdk/_docs/CHANGELOG.md
trunk/extensions/OpenStackManager/aws-sdk/sdk.class.php
trunk/extensions/OpenStackManager/aws-sdk/services/as.class.php
trunk/extensions/OpenStackManager/aws-sdk/services/cloudformation.class.php
trunk/extensions/OpenStackManager/aws-sdk/services/cloudwatch.class.php
trunk/extensions/OpenStackManager/aws-sdk/services/ec2.class.php
trunk/extensions/OpenStackManager/aws-sdk/services/elb.class.php
trunk/extensions/OpenStackManager/aws-sdk/services/emr.class.php
trunk/extensions/OpenStackManager/aws-sdk/services/iam.class.php
trunk/extensions/OpenStackManager/aws-sdk/services/rds.class.php
trunk/extensions/OpenStackManager/aws-sdk/services/s3.class.php
trunk/extensions/OpenStackManager/aws-sdk/services/sdb.class.php
trunk/extensions/OpenStackManager/aws-sdk/services/sns.class.php
trunk/extensions/OpenStackManager/aws-sdk/services/sqs.class.php
Modified: trunk/extensions/OpenStackManager/aws-sdk/_docs/CHANGELOG.md
===================================================================
--- trunk/extensions/OpenStackManager/aws-sdk/_docs/CHANGELOG.md
2011-11-14 20:04:46 UTC (rev 103021)
+++ trunk/extensions/OpenStackManager/aws-sdk/_docs/CHANGELOG.md
2011-11-14 20:13:58 UTC (rev 103022)
@@ -1,3 +1,53 @@
+# Changelog: 1.4.7 "Yuna"
+<http://finalfantasy.wikia.com/wiki/Yuna>
+
+Launched Wednesday, November 9, 2011
+
+## Service Classes
+### AmazonAS
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+
+### AmazonCloudFormation
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+
+### AmazonCloudWatch
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+* **New:** Support for the US GovCloud region has been added to the SDK.
+
+### AmazonEC2
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+* **New:** Support for the US GovCloud region has been added to the SDK.
+
+### AmazonELB
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+
+### AmazonEMR
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+
+### AmazonIAM
+* **New:** Support for the US GovCloud region has been added to the SDK.
+
+### AmazonRDS
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+
+### AmazonS3
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+* **Fixed:** Resolved an issue where certain bits of metadata were not
maintained during a copy operation.
<https://forums.aws.amazon.com/thread.jspa?threadID=77630>
+* **Fixed:** Resolved an issue where an unsuccessful lookup of an existing
content-type would throw a warning.
<https://forums.aws.amazon.com/thread.jspa?threadID=78121>
+* **Fixed:** Resolved an issue where an exception would be thrown when a
filesize lookup was attempted on an object that didn't exist.
<https://forums.aws.amazon.com/thread.jspa?threadID=78197>
+
+### AmazonSDB
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+
+### AmazonSNS
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+
+### AmazonSQS
+* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK.
+
+
+----
+
# Changelog: 1.4.6 "Xezat"
<http://finalfantasy.wikia.com/wiki/Xezat>
Modified: trunk/extensions/OpenStackManager/aws-sdk/sdk.class.php
===================================================================
--- trunk/extensions/OpenStackManager/aws-sdk/sdk.class.php 2011-11-14
20:04:46 UTC (rev 103021)
+++ trunk/extensions/OpenStackManager/aws-sdk/sdk.class.php 2011-11-14
20:13:58 UTC (rev 103022)
@@ -125,9 +125,9 @@
// INTERMEDIARY CONSTANTS
define('CFRUNTIME_NAME', 'aws-sdk-php');
-define('CFRUNTIME_VERSION', '1.4.6');
+define('CFRUNTIME_VERSION', '1.4.7');
// define('CFRUNTIME_BUILD', gmdate('YmdHis', filemtime(__FILE__))); // @todo:
Hardcode for release.
-define('CFRUNTIME_BUILD', '20111103191027');
+define('CFRUNTIME_BUILD', '20111109191027');
define('CFRUNTIME_USERAGENT', CFRUNTIME_NAME . '/' . CFRUNTIME_VERSION . '
PHP/' . PHP_VERSION . ' ' . str_replace(' ', '_', php_uname('s')) . '/' .
str_replace(' ', '_', php_uname('r')) . ' Arch/' . php_uname('m') . ' SAPI/' .
php_sapi_name() . ' Integer/' . PHP_INT_MAX . ' Build/' . CFRUNTIME_BUILD .
__aws_sdk_ua_callback());
Modified: trunk/extensions/OpenStackManager/aws-sdk/services/as.class.php
===================================================================
--- trunk/extensions/OpenStackManager/aws-sdk/services/as.class.php
2011-11-14 20:04:46 UTC (rev 103021)
+++ trunk/extensions/OpenStackManager/aws-sdk/services/as.class.php
2011-11-14 20:13:58 UTC (rev 103022)
@@ -51,36 +51,41 @@
// CLASS CONSTANTS
/**
- * Specify the default queue URL.
+ * Specify the queue URL for the United States East (Northern Virginia)
Region.
*/
- const DEFAULT_URL = 'autoscaling.us-east-1.amazonaws.com';
+ const REGION_US_E1 = 'autoscaling.us-east-1.amazonaws.com';
/**
- * Specify the queue URL for the US-East (Northern Virginia) Region.
+ * Specify the queue URL for the United States West (Northern
California) Region.
*/
- const REGION_US_E1 = self::DEFAULT_URL;
+ const REGION_US_W1 = 'autoscaling.us-west-1.amazonaws.com';
/**
- * Specify the queue URL for the US-West (Northern California) Region.
+ * Specify the queue URL for the United States West (Oregon) Region.
*/
- const REGION_US_W1 = 'autoscaling.us-west-1.amazonaws.com';
+ const REGION_US_W2 = 'autoscaling.us-west-2.amazonaws.com';
/**
- * Specify the queue URL for the EU (Ireland) Region.
+ * Specify the queue URL for the Europe West (Ireland) Region.
*/
const REGION_EU_W1 = 'autoscaling.eu-west-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Singapore) Region.
+ * Specify the queue URL for the Asia Pacific Southeast (Singapore)
Region.
*/
const REGION_APAC_SE1 = 'autoscaling.ap-southeast-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Japan) Region.
+ * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region.
*/
const REGION_APAC_NE1 = 'autoscaling.ap-northeast-1.amazonaws.com';
+ /**
+ * Default service endpoint.
+ */
+ const DEFAULT_URL = self::REGION_US_E1;
+
/*%******************************************************************************************%*/
// SETTERS
Modified:
trunk/extensions/OpenStackManager/aws-sdk/services/cloudformation.class.php
===================================================================
--- trunk/extensions/OpenStackManager/aws-sdk/services/cloudformation.class.php
2011-11-14 20:04:46 UTC (rev 103021)
+++ trunk/extensions/OpenStackManager/aws-sdk/services/cloudformation.class.php
2011-11-14 20:13:58 UTC (rev 103022)
@@ -61,36 +61,41 @@
// CLASS CONSTANTS
/**
- * Specify the default queue URL.
+ * Specify the queue URL for the United States East (Northern Virginia)
Region.
*/
- const DEFAULT_URL = 'cloudformation.us-east-1.amazonaws.com';
+ const REGION_US_E1 = 'cloudformation.us-east-1.amazonaws.com';
/**
- * Specify the queue URL for the US-East (Northern Virginia) Region.
+ * Specify the queue URL for the United States West (Northern
California) Region.
*/
- const REGION_US_E1 = self::DEFAULT_URL;
+ const REGION_US_W1 = 'cloudformation.us-west-1.amazonaws.com';
/**
- * Specify the queue URL for the US-West (Northern California) Region.
+ * Specify the queue URL for the United States West (Oregon) Region.
*/
- const REGION_US_W1 = 'cloudformation.us-west-1.amazonaws.com';
+ const REGION_US_W2 = 'cloudformation.us-west-2.amazonaws.com';
/**
- * Specify the queue URL for the EU (Ireland) Region.
+ * Specify the queue URL for the Europe West (Ireland) Region.
*/
const REGION_EU_W1 = 'cloudformation.eu-west-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Singapore) Region.
+ * Specify the queue URL for the Asia Pacific Southeast (Singapore)
Region.
*/
const REGION_APAC_SE1 = 'cloudformation.ap-southeast-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Japan) Region.
+ * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region.
*/
const REGION_APAC_NE1 = 'cloudformation.ap-northeast-1.amazonaws.com';
+ /**
+ * Default service endpoint.
+ */
+ const DEFAULT_URL = self::REGION_US_E1;
+
/*%******************************************************************************************%*/
// SETTERS
Modified:
trunk/extensions/OpenStackManager/aws-sdk/services/cloudwatch.class.php
===================================================================
--- trunk/extensions/OpenStackManager/aws-sdk/services/cloudwatch.class.php
2011-11-14 20:04:46 UTC (rev 103021)
+++ trunk/extensions/OpenStackManager/aws-sdk/services/cloudwatch.class.php
2011-11-14 20:13:58 UTC (rev 103022)
@@ -60,36 +60,46 @@
// CLASS CONSTANTS
/**
- * Specify the default queue URL.
+ * Specify the queue URL for the United States East (Northern Virginia)
Region.
*/
- const DEFAULT_URL = 'monitoring.amazonaws.com';
+ const REGION_US_E1 = 'monitoring.us-east-1.amazonaws.com';
/**
- * Specify the queue URL for the US-East (Northern Virginia) Region.
+ * Specify the queue URL for the United States West (Northern
California) Region.
*/
- const REGION_US_E1 = 'us-east-1';
+ const REGION_US_W1 = 'monitoring.us-west-1.amazonaws.com';
/**
- * Specify the queue URL for the US-West (Northern California) Region.
+ * Specify the queue URL for the United States West (Oregon) Region.
*/
- const REGION_US_W1 = 'us-west-1';
+ const REGION_US_W2 = 'monitoring.us-west-2.amazonaws.com';
/**
- * Specify the queue URL for the EU (Ireland) Region.
+ * Specify the queue URL for the Europe West (Ireland) Region.
*/
- const REGION_EU_W1 = 'eu-west-1';
+ const REGION_EU_W1 = 'monitoring.eu-west-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Singapore) Region.
+ * Specify the queue URL for the Asia Pacific Southeast (Singapore)
Region.
*/
- const REGION_APAC_SE1 = 'ap-southeast-1';
+ const REGION_APAC_SE1 = 'monitoring.ap-southeast-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Japan) Region.
+ * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region.
*/
- const REGION_APAC_NE1 = 'ap-northeast-1';
+ const REGION_APAC_NE1 = 'monitoring.ap-northeast-1.amazonaws.com';
+ /**
+ * Specify the queue URL for the United States GovCloud Region.
+ */
+ const REGION_US_GOV1 = 'monitoring.us-gov-west-1.amazonaws.com';
+ /**
+ * Default service endpoint.
+ */
+ const DEFAULT_URL = self::REGION_US_E1;
+
+
/*%******************************************************************************************%*/
// SETTERS
Modified: trunk/extensions/OpenStackManager/aws-sdk/services/ec2.class.php
===================================================================
--- trunk/extensions/OpenStackManager/aws-sdk/services/ec2.class.php
2011-11-14 20:04:46 UTC (rev 103021)
+++ trunk/extensions/OpenStackManager/aws-sdk/services/ec2.class.php
2011-11-14 20:13:58 UTC (rev 103022)
@@ -40,36 +40,46 @@
// CLASS CONSTANTS
/**
- * Specify the default queue URL.
+ * Specify the queue URL for the United States East (Northern Virginia)
Region.
*/
- const DEFAULT_URL = 'ec2.amazonaws.com';
+ const REGION_US_E1 = 'ec2.us-east-1.amazonaws.com';
/**
- * Specify the queue URL for the US-East (Northern Virginia) Region.
+ * Specify the queue URL for the United States West (Northern
California) Region.
*/
- const REGION_US_E1 = 'us-east-1';
+ const REGION_US_W1 = 'ec2.us-west-1.amazonaws.com';
/**
- * Specify the queue URL for the US-West (Northern California) Region.
+ * Specify the queue URL for the United States West (Oregon) Region.
*/
- const REGION_US_W1 = 'us-west-1';
+ const REGION_US_W2 = 'ec2.us-west-2.amazonaws.com';
/**
- * Specify the queue URL for the EU (Ireland) Region.
+ * Specify the queue URL for the Europe West (Ireland) Region.
*/
- const REGION_EU_W1 = 'eu-west-1';
+ const REGION_EU_W1 = 'ec2.eu-west-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Singapore) Region.
+ * Specify the queue URL for the Asia Pacific Southeast (Singapore)
Region.
*/
- const REGION_APAC_SE1 = 'ap-southeast-1';
+ const REGION_APAC_SE1 = 'ec2.ap-southeast-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Japan) Region.
+ * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region.
*/
- const REGION_APAC_NE1 = 'ap-northeast-1';
+ const REGION_APAC_NE1 = 'ec2.ap-northeast-1.amazonaws.com';
/**
+ * Specify the queue URL for the United States GovCloud Region.
+ */
+ const REGION_US_GOV1 = 'ec2.us-gov-west-1.amazonaws.com';
+
+ /**
+ * Default service endpoint.
+ */
+ const DEFAULT_URL = self::REGION_US_E1;
+
+ /**
* The "pending" state code of an EC2 instance. Useful for conditionals.
*/
const STATE_PENDING = 0;
Modified: trunk/extensions/OpenStackManager/aws-sdk/services/elb.class.php
===================================================================
--- trunk/extensions/OpenStackManager/aws-sdk/services/elb.class.php
2011-11-14 20:04:46 UTC (rev 103021)
+++ trunk/extensions/OpenStackManager/aws-sdk/services/elb.class.php
2011-11-14 20:13:58 UTC (rev 103022)
@@ -34,36 +34,41 @@
// CLASS CONSTANTS
/**
- * Specify the default queue URL.
+ * Specify the queue URL for the United States East (Northern Virginia)
Region.
*/
- const DEFAULT_URL = 'elasticloadbalancing.us-east-1.amazonaws.com';
+ const REGION_US_E1 = 'elasticloadbalancing.us-east-1.amazonaws.com';
/**
- * Specify the queue URL for the US-East (Northern Virginia) Region.
+ * Specify the queue URL for the United States West (Northern
California) Region.
*/
- const REGION_US_E1 = self::DEFAULT_URL;
+ const REGION_US_W1 = 'elasticloadbalancing.us-west-1.amazonaws.com';
/**
- * Specify the queue URL for the US-West (Northern California) Region.
+ * Specify the queue URL for the United States West (Oregon) Region.
*/
- const REGION_US_W1 = 'elasticloadbalancing.us-west-1.amazonaws.com';
+ const REGION_US_W2 = 'elasticloadbalancing.us-west-2.amazonaws.com';
/**
- * Specify the queue URL for the EU (Ireland) Region.
+ * Specify the queue URL for the Europe West (Ireland) Region.
*/
const REGION_EU_W1 = 'elasticloadbalancing.eu-west-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Singapore) Region.
+ * Specify the queue URL for the Asia Pacific Southeast (Singapore)
Region.
*/
const REGION_APAC_SE1 =
'elasticloadbalancing.ap-southeast-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Japan) Region.
+ * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region.
*/
const REGION_APAC_NE1 =
'elasticloadbalancing.ap-northeast-1.amazonaws.com';
+ /**
+ * Default service endpoint.
+ */
+ const DEFAULT_URL = self::REGION_US_E1;
+
/*%******************************************************************************************%*/
// SETTERS
Modified: trunk/extensions/OpenStackManager/aws-sdk/services/emr.class.php
===================================================================
--- trunk/extensions/OpenStackManager/aws-sdk/services/emr.class.php
2011-11-14 20:04:46 UTC (rev 103021)
+++ trunk/extensions/OpenStackManager/aws-sdk/services/emr.class.php
2011-11-14 20:13:58 UTC (rev 103022)
@@ -36,36 +36,41 @@
// CLASS CONSTANTS
/**
- * Specify the default queue URL.
+ * Specify the queue URL for the United States East (Northern Virginia)
Region.
*/
- const DEFAULT_URL = 'us-east-1.elasticmapreduce.amazonaws.com';
+ const REGION_US_E1 = 'elasticmapreduce.us-east-1.amazonaws.com';
/**
- * Specify the queue URL for the US-East (Northern Virginia) Region.
+ * Specify the queue URL for the United States West (Northern
California) Region.
*/
- const REGION_US_E1 = self::DEFAULT_URL;
+ const REGION_US_W1 = 'elasticmapreduce.us-west-1.amazonaws.com';
/**
- * Specify the queue URL for the US-West (Northern California) Region.
+ * Specify the queue URL for the United States West (Oregon) Region.
*/
- const REGION_US_W1 = 'us-west-1.elasticmapreduce.amazonaws.com';
+ const REGION_US_W2 = 'elasticmapreduce.us-west-2.amazonaws.com';
/**
- * Specify the queue URL for the EU (Ireland) Region.
+ * Specify the queue URL for the Europe West (Ireland) Region.
*/
- const REGION_EU_W1 = 'eu-west-1.elasticmapreduce.amazonaws.com';
+ const REGION_EU_W1 = 'elasticmapreduce.eu-west-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Singapore) Region.
+ * Specify the queue URL for the Asia Pacific Southeast (Singapore)
Region.
*/
- const REGION_APAC_SE1 = 'ap-southeast-1.elasticmapreduce.amazonaws.com';
+ const REGION_APAC_SE1 = 'elasticmapreduce.ap-southeast-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Japan) Region.
+ * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region.
*/
- const REGION_APAC_NE1 = 'ap-northeast-1.elasticmapreduce.amazonaws.com';
+ const REGION_APAC_NE1 = 'elasticmapreduce.ap-northeast-1.amazonaws.com';
+ /**
+ * Default service endpoint.
+ */
+ const DEFAULT_URL = self::REGION_US_E1;
+
/*%******************************************************************************************%*/
// SETTERS
Modified: trunk/extensions/OpenStackManager/aws-sdk/services/iam.class.php
===================================================================
--- trunk/extensions/OpenStackManager/aws-sdk/services/iam.class.php
2011-11-14 20:04:46 UTC (rev 103021)
+++ trunk/extensions/OpenStackManager/aws-sdk/services/iam.class.php
2011-11-14 20:13:58 UTC (rev 103022)
@@ -52,6 +52,11 @@
const REGION_US_E1 = 'iam.amazonaws.com';
/**
+ * Specify the queue URL for the United States GovCloud Region.
+ */
+ const REGION_US_GOV1 = 'iam.us-gov.amazonaws.com';
+
+ /**
* Default service endpoint.
*/
const DEFAULT_URL = self::REGION_US_E1;
Modified: trunk/extensions/OpenStackManager/aws-sdk/services/rds.class.php
===================================================================
--- trunk/extensions/OpenStackManager/aws-sdk/services/rds.class.php
2011-11-14 20:04:46 UTC (rev 103021)
+++ trunk/extensions/OpenStackManager/aws-sdk/services/rds.class.php
2011-11-14 20:13:58 UTC (rev 103022)
@@ -40,36 +40,41 @@
// CLASS CONSTANTS
/**
- * Specify the default queue URL.
+ * Specify the queue URL for the United States East (Northern Virginia)
Region.
*/
- const DEFAULT_URL = 'rds.us-east-1.amazonaws.com';
+ const REGION_US_E1 = 'rds.us-east-1.amazonaws.com';
/**
- * Specify the queue URL for the US-East (Northern Virginia) Region.
+ * Specify the queue URL for the United States West (Northern
California) Region.
*/
- const REGION_US_E1 = self::DEFAULT_URL;
+ const REGION_US_W1 = 'rds.us-west-1.amazonaws.com';
/**
- * Specify the queue URL for the US-West (Northern California) Region.
+ * Specify the queue URL for the United States West (Oregon) Region.
*/
- const REGION_US_W1 = 'rds.us-west-1.amazonaws.com';
+ const REGION_US_W2 = 'rds.us-west-2.amazonaws.com';
/**
- * Specify the queue URL for the EU (Ireland) Region.
+ * Specify the queue URL for the Europe West (Ireland) Region.
*/
const REGION_EU_W1 = 'rds.eu-west-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Singapore) Region.
+ * Specify the queue URL for the Asia Pacific Southeast (Singapore)
Region.
*/
const REGION_APAC_SE1 = 'rds.ap-southeast-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Japan) Region.
+ * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region.
*/
const REGION_APAC_NE1 = 'rds.ap-northeast-1.amazonaws.com';
+ /**
+ * Default service endpoint.
+ */
+ const DEFAULT_URL = self::REGION_US_E1;
+
/*%******************************************************************************************%*/
// SETTERS
Modified: trunk/extensions/OpenStackManager/aws-sdk/services/s3.class.php
===================================================================
--- trunk/extensions/OpenStackManager/aws-sdk/services/s3.class.php
2011-11-14 20:04:46 UTC (rev 103021)
+++ trunk/extensions/OpenStackManager/aws-sdk/services/s3.class.php
2011-11-14 20:13:58 UTC (rev 103022)
@@ -49,7 +49,7 @@
*
* Visit <http://aws.amazon.com/s3/> for more information.
*
- * @version 2011.05.18
+ * @version 2011.11.09
* @license See the included NOTICE.md file for more information.
* @copyright See the included NOTICE.md file for more information.
* @link http://aws.amazon.com/s3/ Amazon Simple Storage Service
@@ -76,6 +76,11 @@
const REGION_US_W1 = 'us-west-1';
/**
+ * Specify the queue URL for the US-West (Oregon) Region.
+ */
+ const REGION_US_W2 = 'us-west-2';
+
+ /**
* Specify the queue URL for the EU (Ireland) Region.
*/
const REGION_EU_W1 = 'EU';
@@ -1450,11 +1455,7 @@
}
// Handle metadata directive
- $opt['headers']['x-amz-metadata-directive'] = 'COPY';
- if ($source['bucket'] === $dest['bucket'] &&
$source['filename'] === $dest['filename'])
- {
- $opt['headers']['x-amz-metadata-directive'] = 'REPLACE';
- }
+ $opt['headers']['x-amz-metadata-directive'] = 'REPLACE';
if (isset($opt['metadataDirective']))
{
$opt['headers']['x-amz-metadata-directive'] =
$opt['metadataDirective'];
@@ -1936,7 +1937,7 @@
*
* @param string $bucket (Required) The name of the bucket to use.
* @param boolean $friendly_format (Optional) A value of
<code>true</code> will format the return value to 2 decimal points using the
largest possible unit (i.e., 3.42 GB). A value of <code>false</code> will
format the return value as the raw number of bytes.
- * @return integer|string The number of bytes as an integer, or the
friendly format as a string.
+ * @return integer|string The number of bytes as an integer, or the
friendly format as a string. If the bucket does not exist, the filesize will be
0.
*/
public function get_bucket_filesize($bucket, $friendly_format = false)
{
@@ -1980,7 +1981,7 @@
* @param string $bucket (Required) The name of the bucket to use.
* @param string $filename (Required) The file name for the object.
* @param boolean $friendly_format (Optional) A value of
<code>true</code> will format the return value to 2 decimal points using the
largest possible unit (i.e., 3.42 GB). A value of <code>false</code> will
format the return value as the raw number of bytes.
- * @return integer|string The number of bytes as an integer, or the
friendly format as a string.
+ * @return integer|string The number of bytes as an integer, or the
friendly format as a string. If the object does not exist, the filesize will be
0.
*/
public function get_object_filesize($bucket, $filename,
$friendly_format = false)
{
@@ -1989,9 +1990,14 @@
throw new S3_Exception(__FUNCTION__ . '() cannot be
batch requested');
}
+ $filesize = 0;
$object = $this->get_object_headers($bucket, $filename);
- $filesize = (integer) $object->header['content-length'];
+ if (isset($object->header['content-length']))
+ {
+ $filesize = (integer) $object->header['content-length'];
+ }
+
if ($friendly_format)
{
$filesize = $this->util->size_readable($filesize);
@@ -2352,7 +2358,7 @@
);
// Add the content type
- $data['ContentType'] = (string)
$response[1]->header['content-type'];
+ $data['ContentType'] =
isset($response[1]->header['content-type']) ? (string)
$response[1]->header['content-type'] : '';
// Add the other metadata (including storage type)
$contents =
json_decode(json_encode($response[2]->body->query('descendant-or-self::Contents')->first()),
true);
Modified: trunk/extensions/OpenStackManager/aws-sdk/services/sdb.class.php
===================================================================
--- trunk/extensions/OpenStackManager/aws-sdk/services/sdb.class.php
2011-11-14 20:04:46 UTC (rev 103021)
+++ trunk/extensions/OpenStackManager/aws-sdk/services/sdb.class.php
2011-11-14 20:13:58 UTC (rev 103022)
@@ -44,36 +44,41 @@
// CLASS CONSTANTS
/**
- * Specify the default queue URL.
+ * Specify the queue URL for the United States East (Northern Virginia)
Region.
*/
- const DEFAULT_URL = 'sdb.amazonaws.com';
+ const REGION_US_E1 = 'sdb.amazonaws.com';
/**
- * Specify the queue URL for the US-East (Northern Virginia) Region.
+ * Specify the queue URL for the United States West (Northern
California) Region.
*/
- const REGION_US_E1 = self::DEFAULT_URL;
+ const REGION_US_W1 = 'sdb.us-west-1.amazonaws.com';
/**
- * Specify the queue URL for the US-West (Northern California) Region.
+ * Specify the queue URL for the United States West (Oregon) Region.
*/
- const REGION_US_W1 = 'sdb.us-west-1.amazonaws.com';
+ const REGION_US_W2 = 'sdb.us-west-2.amazonaws.com';
/**
- * Specify the queue URL for the EU (Ireland) Region.
+ * Specify the queue URL for the Europe West (Ireland) Region.
*/
const REGION_EU_W1 = 'sdb.eu-west-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Singapore) Region.
+ * Specify the queue URL for the Asia Pacific Southeast (Singapore)
Region.
*/
const REGION_APAC_SE1 = 'sdb.ap-southeast-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Japan) Region.
+ * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region.
*/
const REGION_APAC_NE1 = 'sdb.ap-northeast-1.amazonaws.com';
+ /**
+ * Default service endpoint.
+ */
+ const DEFAULT_URL = self::REGION_US_E1;
+
/*%******************************************************************************************%*/
// SETTERS
Modified: trunk/extensions/OpenStackManager/aws-sdk/services/sns.class.php
===================================================================
--- trunk/extensions/OpenStackManager/aws-sdk/services/sns.class.php
2011-11-14 20:04:46 UTC (rev 103021)
+++ trunk/extensions/OpenStackManager/aws-sdk/services/sns.class.php
2011-11-14 20:13:58 UTC (rev 103022)
@@ -30,36 +30,41 @@
// CLASS CONSTANTS
/**
- * Specify the default queue URL.
+ * Specify the queue URL for the United States East (Northern Virginia)
Region.
*/
- const DEFAULT_URL = 'sns.us-east-1.amazonaws.com';
+ const REGION_US_E1 = 'sns.us-east-1.amazonaws.com';
/**
- * Specify the queue URL for the US-East (Northern Virginia) Region.
+ * Specify the queue URL for the United States West (Northern
California) Region.
*/
- const REGION_US_E1 = self::DEFAULT_URL;
+ const REGION_US_W1 = 'sns.us-west-1.amazonaws.com';
/**
- * Specify the queue URL for the US-West (Northern California) Region.
+ * Specify the queue URL for the United States West (Oregon) Region.
*/
- const REGION_US_W1 = 'sns.us-west-1.amazonaws.com';
+ const REGION_US_W2 = 'sns.us-west-2.amazonaws.com';
/**
- * Specify the queue URL for the EU (Ireland) Region.
+ * Specify the queue URL for the Europe West (Ireland) Region.
*/
const REGION_EU_W1 = 'sns.eu-west-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Singapore) Region.
+ * Specify the queue URL for the Asia Pacific Southeast (Singapore)
Region.
*/
const REGION_APAC_SE1 = 'sns.ap-southeast-1.amazonaws.com';
/**
- * Specify the queue URL for the Asia Pacific (Japan) Region.
+ * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region.
*/
const REGION_APAC_NE1 = 'sns.ap-northeast-1.amazonaws.com';
+ /**
+ * Default service endpoint.
+ */
+ const DEFAULT_URL = self::REGION_US_E1;
+
/*%******************************************************************************************%*/
// SETTERS
Modified: trunk/extensions/OpenStackManager/aws-sdk/services/sqs.class.php
===================================================================
--- trunk/extensions/OpenStackManager/aws-sdk/services/sqs.class.php
2011-11-14 20:04:46 UTC (rev 103021)
+++ trunk/extensions/OpenStackManager/aws-sdk/services/sqs.class.php
2011-11-14 20:13:58 UTC (rev 103022)
@@ -52,6 +52,11 @@
const REGION_US_W1 = 'sqs.us-west-1.amazonaws.com';
/**
+ * Specify the queue URL for the United States West (Oregon) Region.
+ */
+ const REGION_US_W2 = 'sqs.us-west-2.amazonaws.com';
+
+ /**
* Specify the queue URL for the Europe West (Ireland) Region.
*/
const REGION_EU_W1 = 'sqs.eu-west-1.amazonaws.com';
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
