r93651 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r93650‎ | r93651 | r93652 >
Date:20:42, 1 August 2011
Author:reedy
Status:ok
Tags:
Comment:
aws-sdk 1.3.7 from 1.3.4
Modified paths:
  • /trunk/extensions/OpenStackManager/aws-sdk/_compatibility_test/sdk_compatibility_test.php (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/_compatibility_test/sdk_compatibility_test_cli.php (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/_docs/CHANGELOG.md (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/config-sample.inc.php (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/lib/requestcore/cacert.pem (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/sdk.class.php (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/services/as.class.php (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/services/cloudformation.class.php (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/services/cloudwatch.class.php (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/services/ec2.class.php (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/services/elasticbeanstalk.class.php (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/services/elb.class.php (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/services/iam.class.php (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/services/importexport.class.php (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/services/rds.class.php (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/services/s3.class.php (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/services/sdb.class.php (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/services/ses.class.php (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/services/sns.class.php (modified) (history)
  • /trunk/extensions/OpenStackManager/aws-sdk/services/sqs.class.php (modified) (history)

Diff [purge]

Index: trunk/extensions/OpenStackManager/aws-sdk/config-sample.inc.php
@@ -53,6 +53,26 @@
5454 define('AWS_CERTIFICATE_AUTHORITY', false);
5555
5656 /**
 57+ * This option allows you to configure a preferred storage type to use for caching by default. This can
 58+ * be changed later using the set_cache_config() method.
 59+ *
 60+ * Valid values are: `apc`, `xcache`, a DSN-style string such as `pdo.sqlite:/sqlite/cache.db`, a file
 61+ * system path such as `./cache` or `/tmp/cache/`, or a serialized array for memcached configuration.
 62+ *
 63+ * serialize(array(
 64+ * array(
 65+ * 'host' => '127.0.0.1',
 66+ * 'port' => '11211'
 67+ * ),
 68+ * array(
 69+ * 'host' => '127.0.0.2',
 70+ * 'port' => '11211'
 71+ * )
 72+ * ));
 73+ */
 74+define('AWS_DEFAULT_CACHE_CONFIG', '');
 75+
 76+/**
5777 * 12-digit serial number taken from the Gemalto device used for Multi-Factor Authentication. Ignore this
5878 * if you're not using MFA.
5979 */
Index: trunk/extensions/OpenStackManager/aws-sdk/services/cloudformation.class.php
@@ -48,7 +48,7 @@
4949 * Amazon CloudFormation makes use of other AWS products. If you need additional technical information about a specific AWS product, you can
5050 * find the product's technical documentation at <a href="http://aws.amazon.com/documentation/">http://aws.amazon.com/documentation/</a>.
5151 *
52 - * @version Tue May 10 18:24:21 PDT 2011
 52+ * @version Tue Jul 12 16:07:23 PDT 2011
5353 * @license See the included NOTICE.md file for complete information.
5454 * @copyright See the included NOTICE.md file for complete information.
5555 * @link http://aws.amazon.com/cloudformation/Amazon CloudFormation
@@ -145,7 +145,36 @@
146146
147147 /**
148148 *
149 - * Creates a stack as specified in the template. Once the call completes successfully, the stack creation starts. You can check the status of
 149+ * Returns the summary information for stacks whose status matches the specified StackStatusFilter. Summary information for stacks that have
 150+ * been deleted is kept for 90 days after the stack is deleted. If no StackStatusFilter is specified, summary information for all stacks is
 151+ * returned (including existing stacks and stacks that have been deleted).
 152+ *
 153+ * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
 154+ * <li><code>NextToken</code> - <code>string</code> - Optional - </li>
 155+ * <li><code>StackStatusFilter</code> - <code>string|array</code> - Optional - Pass a string for a single value, or an indexed array for multiple values. </li>
 156+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
 157+ * <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
 158+ * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
 159+ */
 160+ public function list_stacks($opt = null)
 161+ {
 162+ if (!$opt) $opt = array();
 163+
 164+ // Optional parameter
 165+ if (isset($opt['StackStatusFilter']))
 166+ {
 167+ $opt = array_merge($opt, CFComplexType::map(array(
 168+ 'StackStatusFilter' => (is_array($opt['StackStatusFilter']) ? $opt['StackStatusFilter'] : array($opt['StackStatusFilter']))
 169+ ), 'member'));
 170+ unset($opt['StackStatusFilter']);
 171+ }
 172+
 173+ return $this->authenticate('ListStacks', $opt, $this->hostname);
 174+ }
 175+
 176+ /**
 177+ *
 178+ * Creates a stack as specified in the template. After the call completes successfully, the stack creation starts. You can check the status of
150179 * the stack via the DescribeStacks API.
151180 *
152181 * Currently, the limit for stacks is 20 stacks per account per region.
@@ -233,7 +262,7 @@
234263 *
235264 * Returns all the stack related events for the AWS account. If <code>StackName</code> is specified, returns events related to all the stacks
236265 * with the given name. If <code>StackName</code> is not specified, returns all the events for the account. For more information about a
237 - * stack's event history, go to the <a href="http://docs.amazonwebservices.com/AWSCloudFormation/latest/CFNGuide">AWS CloudFormation User
 266+ * stack's event history, go to the <a href="http://docs.amazonwebservices.com/AWSCloudFormation/latest/UserGuide">AWS CloudFormation User
238267 * Guide</a>.
239268 *
240269 * Events are returned, even if the stack never existed or has been successfully deleted.
@@ -254,8 +283,10 @@
255284
256285 /**
257286 *
258 - * Returns the template body for a specified stack name.
 287+ * Returns the template body for a specified stack name. You can get the template for running or deleted stacks.
259288 *
 289+ * For deleted stacks, GetTemplate returns the template for up to 90 days after the stack has been deleted.
 290+ *
260291 * If the template does not exist, a <code>ValidationError</code> is returned.
261292 *
262293 * @param string $stack_name (Required) The name or the unique identifier associated with the stack.
@@ -274,6 +305,28 @@
275306
276307 /**
277308 *
 309+ * Returns a description of the specified resource in the specified stack.
 310+ *
 311+ * For deleted stacks, DescribeStackResource returns resource information for up to 90 days after the stack has been deleted.
 312+ *
 313+ * @param string $stack_name (Required) The name or the unique identifier associated with the stack. Default: There is no default value.
 314+ * @param string $logical_resource_id (Required) The logical name of the resource as specified in the template.<br></br> Default: There is on default value.
 315+ * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
 316+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
 317+ * <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
 318+ * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
 319+ */
 320+ public function describe_stack_resource($stack_name, $logical_resource_id, $opt = null)
 321+ {
 322+ if (!$opt) $opt = array();
 323+ $opt['StackName'] = $stack_name;
 324+ $opt['LogicalResourceId'] = $logical_resource_id;
 325+
 326+ return $this->authenticate('DescribeStackResource', $opt, $this->hostname);
 327+ }
 328+
 329+ /**
 330+ *
278331 * Deletes a specified stack. Once the call completes successfully, stack deletion starts. Deleted stacks do not show up in the DescribeStacks
279332 * API if the deletion has been completed successfully.
280333 *
@@ -293,12 +346,36 @@
294347
295348 /**
296349 *
297 - * Returns AWS resource descriptions. If <code>StackName</code> is specified, all the associated resources that are part of the stack are
298 - * returned. If <code>PhysicalResourceId</code> is specified, all the associated resources of the stack the resource belongs to are returned.
 350+ * Returns descriptions of all resources of the specified stack.
299351 *
 352+ * For deleted stacks, ListStackResources returns resource information for up to 90 days after the stack has been deleted.
 353+ *
 354+ * @param string $stack_name (Required) The name or the unique identifier associated with the stack. Default: There is no default value.
 355+ * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
 356+ * <li><code>NextToken</code> - <code>string</code> - Optional - String that identifies the start of the next list of events, if there is one. Default: There is no default value. </li>
 357+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
 358+ * <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
 359+ * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
 360+ */
 361+ public function list_stack_resources($stack_name, $opt = null)
 362+ {
 363+ if (!$opt) $opt = array();
 364+ $opt['StackName'] = $stack_name;
 365+
 366+ return $this->authenticate('ListStackResources', $opt, $this->hostname);
 367+ }
 368+
 369+ /**
 370+ *
 371+ * Returns AWS resource descriptions for running and deleted stacks. If <code>StackName</code> is specified, all the associated resources that
 372+ * are part of the stack are returned. If <code>PhysicalResourceId</code> is specified, all the associated resources of the stack the resource
 373+ * belongs to are returned.
 374+ *
 375+ * For deleted stacks, DescribeStackResources returns resource information for up to 90 days after the stack has been deleted.
 376+ *
300377 * You must specify <code>StackName</code> or <code>PhysicalResourceId.</code> In addition, you can specify <code>LogicalResourceId</code> to
301378 * filter the returned result. For more information about resources, the <code>LogicalResourceId</code> and <code>PhysicalResourceId</code>, go
302 - * to the <a href="http://docs.amazonwebservices.com/AWSCloudFormation/latest/CFNGuide">AWS CloudFormation User Guide</a>.
 379+ * to the <a href="http://docs.amazonwebservices.com/AWSCloudFormation/latest/UserGuide">AWS CloudFormation User Guide</a>.
303380 *
304381 * A <code>ValidationError</code> is returned if you specify both <code>StackName</code> and <code>PhysicalResourceId</code> in the same
305382 * request.
Index: trunk/extensions/OpenStackManager/aws-sdk/services/s3.class.php
@@ -49,7 +49,7 @@
5050 *
5151 * Visit <http://aws.amazon.com/s3/> for more information.
5252 *
53 - * @version 2011.04.22
 53+ * @version 2011.05.18
5454 * @license See the included NOTICE.md file for more information.
5555 * @copyright See the included NOTICE.md file for more information.
5656 * @link http://aws.amazon.com/s3/ Amazon Simple Storage Service
@@ -2370,6 +2370,7 @@
23712371 * <li><code>method</code> - <code>string</code> - Optional - The HTTP method to use for the request. Defaults to a value of <code>GET</code>.</li>
23722372 * <li><code>response</code> - <code>array</code> - Optional - Allows adjustments to specific response headers. Pass an associative array where each key is one of the following: <code>cache-control</code>, <code>content-disposition</code>, <code>content-encoding</code>, <code>content-language</code>, <code>content-type</code>, <code>expires</code>. The <code>expires</code> value should use <php:gmdate()> and be formatted with the <code>DATE_RFC2822</code> constant.</li>
23732373 * <li><code>torrent</code> - <code>boolean</code> - Optional - A value of <code>true</code> will return a URL to a torrent of the Amazon S3 object. A value of <code>false</code> will return a non-torrent URL. Defaults to <code>false</code>.</li>
 2374+ * <li><code>versionId</code> - <code>string</code> - Optional - The version of the object. Version IDs are returned in the <code>x-amz-version-id</code> header of any previous object-related request.</li>
23742375 * <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
23752376 * @return string The file URL, with authentication and/or torrent parameters if requested.
23762377 * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html Using Query String Authentication
@@ -3168,6 +3169,11 @@
31693170 * requests) allow for faster failures and better upload reliability. Larger part sizes (and fewer
31703171 * requests) costs slightly less but has lower upload reliability.
31713172 *
 3173+ * In certain cases with large objects, it's possible for this method to attempt to open more file system
 3174+ * connections than allowed by the OS. In this case, either
 3175+ * <a href="https://forums.aws.amazon.com/thread.jspa?threadID=70216">increase the number of connections
 3176+ * allowed</a> or increase the value of the <code>partSize</code> parameter to use a larger part size.
 3177+ *
31723178 * @param string $bucket (Required) The name of the bucket to use.
31733179 * @param string $filename (Required) The file name for the object.
31743180 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
@@ -3244,7 +3250,7 @@
32453251
32463252 if ($upload_position === false || !isset($upload_filesize) || $upload_filesize === false || $upload_filesize < 0)
32473253 {
3248 - throw new S3_Exception('The size of `fileUpload` cannot be determined in ' . __FUNCTION__ . '().');
 3254+ throw new S3_Exception('The size of `fileUpload` cannot be determined in ' . __FUNCTION__ . '().');
32493255 }
32503256
32513257 // Handle part size
Index: trunk/extensions/OpenStackManager/aws-sdk/services/rds.class.php
@@ -27,7 +27,7 @@
2828 * instance's compute resources and storage capacity to meet your application's demand. As with all Amazon Web Services, there are no up-front
2929 * investments, and you pay only for the resources you use.
3030 *
31 - * @version Tue Jun 07 16:15:51 PDT 2011
 31+ * @version Tue Jul 12 16:11:48 PDT 2011
3232 * @license See the included NOTICE.md file for complete information.
3333 * @copyright See the included NOTICE.md file for complete information.
3434 * @link http://aws.amazon.com/rds/Amazon Relational Database Service
Index: trunk/extensions/OpenStackManager/aws-sdk/services/ses.class.php
@@ -23,7 +23,7 @@
2424 * For specific details on how to construct a service request, please consult the <a
2525 * href="http://docs.amazonwebservices.com/ses/latest/DeveloperGuide">Amazon SES Developer Guide</a>.
2626 *
27 - * @version Tue Jun 07 16:13:56 PDT 2011
 27+ * @version Tue Jul 12 16:09:53 PDT 2011
2828 * @license See the included NOTICE.md file for complete information.
2929 * @copyright See the included NOTICE.md file for complete information.
3030 * @link http://aws.amazon.com/ses/Amazon Simple Email Service
Index: trunk/extensions/OpenStackManager/aws-sdk/services/cloudwatch.class.php
@@ -47,7 +47,7 @@
4848 *
4949 * </ul>
5050 *
51 - * @version Tue May 10 18:24:54 PDT 2011
 51+ * @version Tue Jul 12 16:07:50 PDT 2011
5252 * @license See the included NOTICE.md file for complete information.
5353 * @copyright See the included NOTICE.md file for complete information.
5454 * @link http://aws.amazon.com/cloudwatch/Amazon CloudWatch
Index: trunk/extensions/OpenStackManager/aws-sdk/services/elb.class.php
@@ -21,7 +21,7 @@
2222 * application. It makes it easy for you to distribute application loads between two or more EC2 instances. Elastic Load Balancing enables
2323 * availability through redundancy and supports traffic growth of your application.
2424 *
25 - * @version Tue Jun 07 16:13:31 PDT 2011
 25+ * @version Tue Jul 12 16:09:27 PDT 2011
2626 * @license See the included NOTICE.md file for complete information.
2727 * @copyright See the included NOTICE.md file for complete information.
2828 * @link http://aws.amazon.com/elasticloadbalancing/Amazon Elastic Load Balancing
Index: trunk/extensions/OpenStackManager/aws-sdk/services/as.class.php
@@ -38,7 +38,7 @@
3939 * href="http://docs.amazonwebservices.com/general/latest/gr/index.html?rande.html">Regions and Endpoints</a> in the Amazon Web Services
4040 * General Reference.
4141 *
42 - * @version Tue Jun 07 16:11:09 PDT 2011
 42+ * @version Wed Jul 20 13:14:36 PDT 2011
4343 * @license See the included NOTICE.md file for complete information.
4444 * @copyright See the included NOTICE.md file for complete information.
4545 * @link http://aws.amazon.com/autoscaling/Amazon Auto-Scaling
@@ -140,8 +140,10 @@
141141 *
142142 * @param string $auto_scaling_group_name (Required) The name or ARN of the Auto Scaling Group.
143143 * @param string $scheduled_action_name (Required) The name of this scaling action.
144 - * @param string $time (Required) The time for this action to start. Accepts any value that <php:strtotime()> understands.
145144 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
 145+ * <li><code>Time</code> - <code>string</code> - Optional - The time for this action to start. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
 146+ * <li><code>EndTime</code> - <code>string</code> - Optional - May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
 147+ * <li><code>Recurrence</code> - <code>string</code> - Optional - </li>
146148 * <li><code>MinSize</code> - <code>integer</code> - Optional - The minimum size for the new Auto Scaling group. </li>
147149 * <li><code>MaxSize</code> - <code>integer</code> - Optional - The maximum size for the Auto Scaling group. </li>
148150 * <li><code>DesiredCapacity</code> - <code>integer</code> - Optional - The number of EC2 instances that should be running in the group. </li>
@@ -149,13 +151,24 @@
150152 * <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
151153 * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
152154 */
153 - public function put_scheduled_update_group_action($auto_scaling_group_name, $scheduled_action_name, $time, $opt = null)
 155+ public function put_scheduled_update_group_action($auto_scaling_group_name, $scheduled_action_name, $opt = null)
154156 {
155157 if (!$opt) $opt = array();
156158 $opt['AutoScalingGroupName'] = $auto_scaling_group_name;
157159 $opt['ScheduledActionName'] = $scheduled_action_name;
158 - $opt['Time'] = $this->util->convert_date_to_iso8601($time);
159160
 161+ // Optional parameter
 162+ if (isset($opt['Time']))
 163+ {
 164+ $opt['Time'] = $this->util->convert_date_to_iso8601($opt['Time']);
 165+ }
 166+
 167+ // Optional parameter
 168+ if (isset($opt['EndTime']))
 169+ {
 170+ $opt['EndTime'] = $this->util->convert_date_to_iso8601($opt['EndTime']);
 171+ }
 172+
160173 return $this->authenticate('PutScheduledUpdateGroupAction', $opt, $this->hostname);
161174 }
162175
Index: trunk/extensions/OpenStackManager/aws-sdk/services/sns.class.php
@@ -17,7 +17,7 @@
1818 /**
1919
2020 *
21 - * @version Tue Jun 07 16:16:45 PDT 2011
 21+ * @version Tue Jul 12 16:12:40 PDT 2011
2222 * @license See the included NOTICE.md file for complete information.
2323 * @copyright See the included NOTICE.md file for complete information.
2424 * @link http://aws.amazon.com/sns/Amazon Simple Notification Service
Index: trunk/extensions/OpenStackManager/aws-sdk/services/iam.class.php
@@ -32,7 +32,7 @@
3333 *
3434 * We will refer to Amazon AWS Identity and Access Management using the abbreviated form IAM. All copyrights and legal protections still apply.
3535 *
36 - * @version Tue Jun 07 16:14:45 PDT 2011
 36+ * @version Tue Jul 12 16:10:48 PDT 2011
3737 * @license See the included NOTICE.md file for complete information.
3838 * @copyright See the included NOTICE.md file for complete information.
3939 * @link http://aws.amazon.com/iam/Amazon Identity and Access Management Service
Index: trunk/extensions/OpenStackManager/aws-sdk/services/sqs.class.php
@@ -28,7 +28,7 @@
2929 *
3030 * Visit <a href="http://aws.amazon.com/sqs/">http://aws.amazon.com/sqs/</a> for more information.
3131 *
32 - * @version Tue Jun 07 16:17:11 PDT 2011
 32+ * @version Wed Jul 20 13:21:47 PDT 2011
3333 * @license See the included NOTICE.md file for complete information.
3434 * @copyright See the included NOTICE.md file for complete information.
3535 * @link http://aws.amazon.com/sqs/Amazon Simple Queue Service
@@ -390,6 +390,8 @@
391391 * This action unconditionally deletes the queue specified by the queue URL. Use this operation WITH CARE! The queue is deleted even if it is
392392 * NOT empty.
393393 *
 394+ * Once a queue has been deleted, the queue name is unavailable for use with new queues for 60 seconds.
 395+ *
394396 * @param string $queue_url (Required) The URL of the SQS queue to take action on.
395397 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
396398 * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
Index: trunk/extensions/OpenStackManager/aws-sdk/services/sdb.class.php
@@ -31,7 +31,7 @@
3232 *
3333 * Visit <a href="http://aws.amazon.com/simpledb/">http://aws.amazon.com/simpledb/</a> for more information.
3434 *
35 - * @version Tue Jun 07 16:16:23 PDT 2011
 35+ * @version Wed Jul 20 13:20:46 PDT 2011
3636 * @license See the included NOTICE.md file for complete information.
3737 * @copyright See the included NOTICE.md file for complete information.
3838 * @link http://aws.amazon.com/simpledb/Amazon SimpleDB
@@ -276,7 +276,7 @@
277277 * The PutAttributes operation creates or replaces attributes in an item.
278278 *
279279 * A single item can have the attributes <code>{ "first_name", "first_value" }</code> and
280 - * <code>{ "first_name", second_value" }</code>. However, it cannot have two attribute instances where
 280+ * <code>{ "first_name", "second_value" }</code>. However, it cannot have two attribute instances where
281281 * both the attribute name and attribute value are the same. Optionally, the requestor can supply the
282282 * <code>Replace</code> parameter for each individual attribute. Setting this value to true causes the
283283 * new attribute value to replace the existing attribute value(s).
@@ -366,12 +366,13 @@
367367 * @param array $item_keypairs (Required) Associative array of parameters which are treated as item-key-value and item-key-multivalue pairs (i.e. a key can have one or more values; think tags). <ul>
368368 * <li><code>[item]</code> - <code>array</code> - Set the custom item name as the key for this value.<ul>
369369 * <li><code>[key]</code> - <code>array</code> - Set the custom key name as the key for this value. For the value, pass a string for a single value, or an indexed array for multiple values.</li>
370 - * </ul></li></ul>
 370+ * </ul></li>
 371+ * </ul>
371372 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
372373 * <li><code>Item</code> - <code>array</code> - Optional - A list of items on which to perform the operation. <ul>
373374 * <li><code>x</code> - <code>array</code> - This represents a simple array index. <ul>
374 - * <li><code>ItemName</code> - <code>string</code> - Optional - This is the parameter format supported by the web service API. This is the item name to use.<ul>
375 - * <li><code>Attribute</code> - <code>array</code> - Optional - This is the parameter format supported by the web service API. This is the attribute node.<ul>
 375+ * <li><code>ItemName</code> - <code>string</code> - Optional - This is the parameter format supported by the web service API. This is the item name to use.</li>
 376+ * <li><code>Attribute</code> - <code>array</code> - Optional - This is the parameter format supported by the web service API. This is the attribute node. <ul>
376377 * <li><code>x</code> - <code>array</code> - This represents a simple array index. <ul>
377378 * <li><code>Name</code> - <code>string</code> - Required - The name of the attribute. </li>
378379 * <li><code>AlternateNameEncoding</code> - <code>string</code> - Optional - This is the parameter format supported by the web service API. This is the alternate name encoding to use.</li>
@@ -598,15 +599,16 @@
599600 *
600601 * @param string $domain_name (Required) The name of the domain in which the attributes are being deleted.
601602 * @param array $item_keypairs (Required) Associative array of parameters which are treated as item-key-value and item-key-multivalue pairs (i.e. a key can have one or more values; think tags). <ul>
602 - * <li><code>[item]</code> - <code>array</code> - Set the custom item name as the key for this value.<ul>
 603+ * <li><code>[item]</code> - <code>array</code> - Set the custom item name as the key for this value. <ul>
603604 * <li><code>[key]</code> - <code>array</code> - Set the custom key name as the key for this value. For the value, pass a string for a single value, or an indexed array for multiple values.</li>
604 - * </ul></li></ul>
 605+ * </ul></li>
 606+ * </ul>
605607 * @param boolean|array $replace (Optional) Whether to replace a key-value pair if a matching key already exists. Supports either a boolean (which affects ALL key-value pairs) or an indexed array of key names (which affects only the keys specified). Defaults to boolean <code>false</code>.
606608 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
607609 * <li><code>Item</code> - <code>array</code> - Optional - A list of items on which to perform the operation. <ul>
608610 * <li><code>x</code> - <code>array</code> - This represents a simple array index. <ul>
609 - * <li><code>ItemName</code> - <code>string</code> - Optional - This is the parameter format supported by the web service API. This is the item name to use.<ul>
610 - * <li><code>Attribute</code> - <code>array</code> - Optional - This is the parameter format supported by the web service API. This is the attribute node.<ul>
 611+ * <li><code>ItemName</code> - <code>string</code> - Optional - This is the parameter format supported by the web service API. This is the item name to use.</li>
 612+ * <li><code>Attribute</code> - <code>array</code> - Optional - This is the parameter format supported by the web service API. This is the attribute node. <ul>
611613 * <li><code>x</code> - <code>array</code> - This represents a simple array index. <ul>
612614 * <li><code>Name</code> - <code>string</code> - Required - The name of the attribute. </li>
613615 * <li><code>AlternateNameEncoding</code> - <code>string</code> - Optional - This is the parameter format supported by the web service API. This is the alternate name encoding to use.</li>
Index: trunk/extensions/OpenStackManager/aws-sdk/services/ec2.class.php
@@ -27,7 +27,7 @@
2828 *
2929 * Visit <a href="http://aws.amazon.com/ec2/">http://aws.amazon.com/ec2/</a> for more information.
3030 *
31 - * @version Tue Jun 07 16:12:59 PDT 2011
 31+ * @version Tue Jul 12 16:08:47 PDT 2011
3232 * @license See the included NOTICE.md file for complete information.
3333 * @copyright See the included NOTICE.md file for complete information.
3434 * @link http://aws.amazon.com/ec2/Amazon Elastic Compute Cloud
Index: trunk/extensions/OpenStackManager/aws-sdk/services/elasticbeanstalk.class.php
@@ -24,8 +24,8 @@
2525 * Amazon Web Services cloud resources.
2626 *
2727 * For more information about this product, go to the <a href="http://aws.amazon.com/elasticbeanstalk/">AWS Elastic Beanstalk</a> details page.
28 - * For specific information about setting up signatures and authorization through the API, go to the <a
29 - * href="http://docs.amazonwebservices.com/elasticbeanstalk/latest/ug/available-apis.html">AWS Elastic Beanstalk User Guide</a>.
 28+ * The location of the lastest AWS Elastic Beanstalk WSDL is <a
 29+ * amazonaws.com/doc/2010-12-01/AWSElasticBeanstalk.wsdl">http://elasticbeanstalk.s3.amazonaws.com/doc/2010-12-01/AWSElasticBeanstalk.wsdl</a>.
3030 *
3131 * <b>Endpoints</b>
3232 *
@@ -35,7 +35,7 @@
3636 *
3737 * </ul>
3838 *
39 - * @version Tue May 10 18:25:29 PDT 2011
 39+ * @version Tue Jul 12 16:08:17 PDT 2011
4040 * @license See the included NOTICE.md file for complete information.
4141 * @copyright See the included NOTICE.md file for complete information.
4242 * @link http://aws.amazon.com/elasticbeanstalk/AWS Elastic Beanstalk
@@ -448,6 +448,26 @@
449449
450450 /**
451451 *
 452+ * Swaps the CNAMEs of two environments.
 453+ *
 454+ * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
 455+ * <li><code>SourceEnvironmentId</code> - <code>string</code> - Optional - The ID of the source environment. Condition: You must specify at least the <code>SourceEnvironmentID</code> or the <code>SourceEnvironmentName</code>. You may also specify both. If you specify the <code>SourceEnvironmentId</code>, you must specify the <code>DestinationEnvironmentId</code>. </li>
 456+ * <li><code>SourceEnvironmentName</code> - <code>string</code> - Optional - The name of the source environment. Condition: You must specify at least the <code>SourceEnvironmentID</code> or the <code>SourceEnvironmentName</code>. You may also specify both. If you specify the <code>SourceEnvironmentName</code>, you must specify the <code>DestinationEnvironmentName</code>. </li>
 457+ * <li><code>DestinationEnvironmentId</code> - <code>string</code> - Optional - The ID of the destination environment. Condition: You must specify at least the <code>DestinationEnvironmentID</code> or the <code>DestinationEnvironmentName</code>. You may also specify both. You must specify the <code>SourceEnvironmentId</code> with the <code>DestinationEnvironmentId</code>. </li>
 458+ * <li><code>DestinationEnvironmentName</code> - <code>string</code> - Optional - The name of the destination environment. Condition: You must specify at least the <code>DestinationEnvironmentID</code> or the <code>DestinationEnvironmentName</code>. You may also specify both. You must specify the <code>SourceEnvironmentName</code> with the <code>DestinationEnvironmentName</code>. </li>
 459+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
 460+ * <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
 461+ * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
 462+ */
 463+ public function swap_environment_cnames($opt = null)
 464+ {
 465+ if (!$opt) $opt = array();
 466+
 467+ return $this->authenticate('SwapEnvironmentCNAMEs', $opt, $this->hostname);
 468+ }
 469+
 470+ /**
 471+ *
452472 * Updates the specified configuration template to have the specified properties or configuration option values.
453473 *
454474 * If a property (for example, <code>ApplicationName</code>) is not provided, its value remains unchanged. To clear such properties, specify
@@ -816,6 +836,7 @@
817837 * <li><code>SourceConfiguration</code> - <code>array</code> - Optional - If specified, AWS Elastic Beanstalk uses the configuration values from the specified configuration template to create a new configuration. Values specified in the <code>OptionSettings</code> parameter of this call overrides any values obtained from the <code>SourceConfiguration</code>. If no configuration template is found, returns an <code>InvalidParameterValue</code> error. Constraint: If both the solution stack name parameter and the source configuration parameters are specified, the solution stack of the source configuration template must match the specified solution stack name or else AWS Elastic Beanstalk returns an <code>InvalidParameterCombination</code> error. <ul>
818838 * <li><code>ApplicationName</code> - <code>string</code> - Optional - The name of the application associated with the configuration. </li>
819839 * <li><code>TemplateName</code> - <code>string</code> - Optional - The name of the configuration template. </li></ul></li>
 840+ * <li><code>EnvironmentId</code> - <code>string</code> - Optional - The ID of the environment used with this configuration template. </li>
820841 * <li><code>Description</code> - <code>string</code> - Optional - Describes this configuration. </li>
821842 * <li><code>OptionSettings</code> - <code>array</code> - Optional - If specified, AWS Elastic Beanstalk sets the specified configuration option to the requested value. The new value overrides the value obtained from the solution stack or the source configuration template. <ul>
822843 * <li><code>x</code> - <code>array</code> - This represents a simple array index. <ul>
@@ -933,7 +954,7 @@
934955
935956 /**
936957 *
937 - * Returns list of event descriptions matching criteria.
 958+ * Returns list of event descriptions matching criteria up to the last 6 weeks.
938959 *
939960 * This action returns the most recent 1,000 events from the specified <code>NextToken</code>.
940961 *
Index: trunk/extensions/OpenStackManager/aws-sdk/services/importexport.class.php
@@ -22,7 +22,7 @@
2323 * Internet. For large data sets, AWS Import/Export is often faster than Internet transfer and more cost effective than upgrading your
2424 * connectivity.
2525 *
26 - * @version Tue Jun 07 16:15:15 PDT 2011
 26+ * @version Tue Jul 12 16:11:17 PDT 2011
2727 * @license See the included NOTICE.md file for complete information.
2828 * @copyright See the included NOTICE.md file for complete information.
2929 * @link http://aws.amazon.com/importexport/Amazon Import/Export Service
Index: trunk/extensions/OpenStackManager/aws-sdk/lib/requestcore/cacert.pem
@@ -14,9 +14,6 @@
1515 ## Just configure this file as the SSLCACertificateFile.
1616 ##
1717
18 -# Ryan Parman elects to use cacert.pem under the Mozilla Public License, version 1.1.
19 -# Amazon elects to use cacert.pem under the Mozilla Public License, version 1.1.
20 -#
2118 # ***** BEGIN LICENSE BLOCK *****
2219 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
2320 #
Index: trunk/extensions/OpenStackManager/aws-sdk/_compatibility_test/sdk_compatibility_test.php
@@ -42,6 +42,7 @@
4343 $sqlite2_ok = extension_loaded('sqlite');
4444 $sqlite3_ok = extension_loaded('sqlite3');
4545 $sqlite_ok = ($pdo_ok && $pdo_sqlite_ok && ($sqlite2_ok || $sqlite3_ok));
 46+$int64_ok = (PHP_INT_MAX === 9223372036854775807);
4647
4748 header('Content-type: text/html; charset=UTF-8');
4849
@@ -321,10 +322,28 @@
322323 </tbody>
323324 </table>
324325
 326+ <h3>Other</h3>
 327+ <table cellpadding="0" cellspacing="0" border="0" width="100%" id="chart">
 328+ <thead>
 329+ <tr>
 330+ <th>Test</th>
 331+ <th>Would Like To Be</th>
 332+ <th>What You Have</th>
 333+ </tr>
 334+ </thead>
 335+ <tbody>
 336+ <tr class="<?php echo ($int64_ok) ? 'enabled' : 'disabled'; ?>">
 337+ <td><a href="https://aws.amazon.com/amis/4158">Architecture</a></td>
 338+ <td>64-bit</td>
 339+ <td><?php echo ($int64_ok) ? '64-bit' : '32-bit'; ?></td>
 340+ </tr>
 341+ </tbody>
 342+ </table>
 343+
325344 <br>
326345 </div>
327346
328 - <?php if ($php_ok && $curl_ok && $simplexml_ok && $spl_ok && $json_ok && $pcre_ok && $file_ok && $openssl_ok && $zlib_ok && ($apc_ok || $xcache_ok || $mc_ok || $sqlite_ok)): ?>
 347+ <?php if ($php_ok && $int64_ok && $curl_ok && $simplexml_ok && $spl_ok && $json_ok && $pcre_ok && $file_ok && $openssl_ok && $zlib_ok && ($apc_ok || $xcache_ok || $mc_ok || $sqlite_ok)): ?>
329348 <div class="chunk important ok">
330349 <h3>Bottom Line: Yes, you can!</h3>
331350 <p>Your PHP environment is ready to go, and can take advantage of all possible features!</p>
@@ -370,6 +389,10 @@
371390 <li>The <a href="http://php.net/zlib">Zlib</a> extension is installed. The SDK will automatically leverage the compression capabilities of Zlib.</li>
372391 <?php endif; ?>
373392
 393+ <?php if (!$int64_ok): ?>
 394+ <li>You're running on a <strong>32-bit</strong> system. This means that PHP does not correctly handle files larger than 2GB (this is a <a href="http://www.google.com/search?q=php+2gb+32-bit">well-known PHP issue</a>). For more information, please see: <a href="http://docs.php.net/manual/en/function.filesize.php#refsect1-function.filesize-returnvalues">PHP filesize: Return values</a>.</li>
 395+ <?php endif; ?>
 396+
374397 <?php
375398 $storage_types = array();
376399 if ($file_ok) { $storage_types[] = '<a href="http://php.net/file_put_contents">The file system</a>'; }
Index: trunk/extensions/OpenStackManager/aws-sdk/_compatibility_test/sdk_compatibility_test_cli.php
@@ -17,6 +17,7 @@
1818 // Optional, but recommended
1919 $openssl_ok = (extension_loaded('openssl') && function_exists('openssl_sign'));
2020 $zlib_ok = extension_loaded('zlib');
 21+$int64_ok = (PHP_INT_MAX === 9223372036854775807);
2122
2223 // Optional
2324 $apc_ok = extension_loaded('apc');
@@ -50,6 +51,7 @@
5152 echo PHP_EOL;
5253
5354 echo 'PHP 5.2 or newer... ' . ($php_ok ? (success() . ' ' . phpversion()) : failure()) . PHP_EOL;
 55+echo 'Architecture... ' . ($int64_ok ? success('64-bit') : failure('32-bit')) . PHP_EOL;
5456 echo 'cURL with SSL... ' . ($curl_ok ? (success() . ' ' . $curl_version['version'] . ' (' . $curl_version['ssl_version'] . ')') : failure($curl_version['version'] . (in_array('https', $curl_version['protocols'], true) ? ' (with ' . $curl_version['ssl_version'] . ')' : ' (without SSL)'))) . PHP_EOL;
5557 echo 'Standard PHP Library... ' . ($spl_ok ? success() : failure()) . PHP_EOL;
5658 echo 'SimpleXML... ' . ($simplexml_ok ? success() : failure()) . PHP_EOL;
@@ -77,6 +79,7 @@
7880 echo 'Your environment meets the minimum requirements for using the AWS SDK for PHP!' . PHP_EOL . PHP_EOL;
7981 if ($openssl_ok) { echo '* The OpenSSL extension is installed. This will allow you to use CloudFront Private URLs and decrypt Windows instance passwords.' . PHP_EOL . PHP_EOL; }
8082 if ($zlib_ok) { echo '* The Zlib extension is installed. The SDK will automatically leverage the compression capabilities of Zlib.' . PHP_EOL . PHP_EOL; }
 83+ if (!$int64_ok) { echo '* You\'re running on a 32-bit system. This means that PHP does not correctly handle files larger than 2GB (this is a well-known PHP issue).' . PHP_EOL . PHP_EOL; }
8184
8285 $storage_types = array();
8386 if ($file_ok) { $storage_types[] = 'The file system'; }
@@ -105,7 +108,7 @@
106109 echo '----------------------------------------' . PHP_EOL;
107110 echo PHP_EOL;
108111
109 -if ($php_ok && $curl_ok && $simplexml_ok && $spl_ok && $json_ok && $pcre_ok && $file_ok && $openssl_ok && $zlib_ok && ($apc_ok || $xcache_ok || $mc_ok || $sqlite_ok))
 112+if ($php_ok && $int64_ok && $curl_ok && $simplexml_ok && $spl_ok && $json_ok && $pcre_ok && $file_ok && $openssl_ok && $zlib_ok && ($apc_ok || $xcache_ok || $mc_ok || $sqlite_ok))
110113 {
111114 echo 'Bottom Line: Yes, you can!' . PHP_EOL;
112115 echo 'Your PHP environment is ready to go, and can take advantage of all possible features!' . PHP_EOL;
Index: trunk/extensions/OpenStackManager/aws-sdk/_docs/CHANGELOG.md
@@ -1,5 +1,58 @@
2 -# Changelog: "Nero"
 2+# Changelog: 1.3.7 "Quistis"
 3+<http://finalfantasy.wikia.com/wiki/Quistis_Trepe>
34
 5+Launched Wednesday, July 25, 2011
 6+
 7+## Bug fixes and enhancements
 8+* Addressed minor bug fixes reported via the feedback form in the API Reference.
 9+
 10+## Service Classes
 11+### AmazonAS
 12+* **New:**
 13+* **Changed:** Introduced backwards-incompatible changes to the <code>put_scheduled_update_group_action()</code> method.
 14+
 15+
 16+----
 17+
 18+# Changelog: 1.3.6 "Penelo"
 19+<http://finalfantasy.wikia.com/wiki/Penelo>
 20+
 21+Launched Tuesday, July 12, 2011
 22+
 23+## Bug fixes and enhancements
 24+* [[Bug Report] rawurlencode error when using SES and curlopts](https://forums.aws.amazon.com/thread.jspa?threadID=68484)
 25+
 26+## Service Classes
 27+### AmazonCloudFormation
 28+* **New:** Support for the `list_stacks()` method has been added to the SDK.
 29+
 30+### AmazonElasticBeanstalk
 31+* **New:** Support for the `swap_environment_cnames()` method has been added to the SDK.
 32+
 33+### AmazonS3
 34+* **Fixed:** Additional information about maximum open connections has been added to the `create_mpu_object()` method.
 35+
 36+## Compatibility Test
 37+* **New:** Now tests whether the system is 64- or 32-bit.
 38+
 39+
 40+----
 41+
 42+# Changelog: 1.3.5 "Occuria"
 43+<http://finalfantasy.wikia.com/wiki/Occuria>
 44+
 45+Launched Tuesday, June 21, 2011
 46+
 47+## Service Classes
 48+### AmazonS3
 49+* **New:** Support for S3 copy part has been added to the SDK.
 50+
 51+
 52+----
 53+
 54+# Changelog: 1.3.4 "Nero"
 55+<http://finalfantasy.wikia.com/wiki/Nero>
 56+
457 Launched Tuesday, June 7, 2011
558
659 ## Bug fixes and enhancements
@@ -30,6 +83,7 @@
3184 ----
3285
3386 # Changelog: 1.3.3 "Moogle"
 87+<http://finalfantasy.wikia.com/wiki/Moogle>
3488
3589 Launched Tuesday, May 10, 2011
3690
@@ -80,6 +134,7 @@
81135 ----
82136
83137 # Changelog: 1.3.2 "Luna"
 138+<http://finalfantasy.wikia.com/wiki/Luna_Wolf>
84139
85140 Launched Tuesday, April 5, 2011
86141
@@ -100,6 +155,7 @@
101156 ----
102157
103158 # Changelog: 1.3.1 "Kraken"
 159+<http://finalfantasy.wikia.com/wiki/Kraken>
104160
105161 Launched Friday, March 25, 2011
106162
@@ -131,6 +187,7 @@
132188 ----
133189
134190 # Changelog: 1.3 "Jecht"
 191+<http://finalfantasy.wikia.com/wiki/Jecht>
135192
136193 Launched Tuesday, March 15, 2011
137194
@@ -146,7 +203,7 @@
147204 * **Fixed:** The `$image_location` parameter in the `register_image()` method is no longer required. This is a backwards-incompatible change.
148205
149206 ### AmazonS3
150 -* **Fixed:** Resolved an issue in <code>get_object()</code> where using the `lastmodified` and `etag` parameters required both to be set before taking effect. They can now be set independently from each other.
 207+* **Fixed:** Resolved an issue in `get_object()` where using the `lastmodified` and `etag` parameters required both to be set before taking effect. They can now be set independently from each other.
151208
152209
153210 ## Utility classes
@@ -171,6 +228,7 @@
172229 ----
173230
174231 # Changelog: 1.2.6 "Ifrit"
 232+<http://finalfantasy.wikia.com/wiki/Ifrit>
175233
176234 Launched Wednesday, March 2, 2011
177235
@@ -228,6 +286,7 @@
229287 ----
230288
231289 # Changelog: 1.2.5 "Heidegger"
 290+<http://finalfantasy.wikia.com/wiki/Heidegger>
232291
233292 Launched Thursday, February 24, 2011
234293
@@ -251,6 +310,7 @@
252311 ----
253312
254313 # Changelog: 1.2.4 "Goltanna"
 314+<http://finalfantasy.wikia.com/wiki/Druksmald_Goltanna>
255315
256316 Launched Wednesday, February 16, 2011
257317
@@ -278,6 +338,7 @@
279339 ----
280340
281341 # Changelog: 1.2.3 "Fayth"
 342+<http://finalfantasy.wikia.com/wiki/Fayth>
282343
283344 Launched Tuesday, January 25, 2010
284345
@@ -292,6 +353,7 @@
293354 ----
294355
295356 # Changelog: 1.2.2 "Esper"
 357+<http://finalfantasy.wikia.com/wiki/Esper>
296358
297359 Launched Tuesday, January 18, 2011
298360
@@ -318,6 +380,7 @@
319381 ----
320382
321383 # Changelog: 1.2.1 "Dio"
 384+<http://finalfantasy.wikia.com/wiki/Dio>
322385
323386 Launched Friday, January 14, 2011
324387
@@ -348,6 +411,7 @@
349412 ----
350413
351414 # Changelog: 1.2 "Cloud"
 415+<http://finalfantasy.wikia.com/wiki/Cloud_Strife>
352416
353417 Launched Friday, December 3, 2010
354418
@@ -379,7 +443,7 @@
380444 * **Fixed:** Resolved an issue where the incorrect formatting of an XML element prevented the ability to update the list of trusted signers.
381445
382446 ### AmazonCloudWatch
383 -* **New:** Support for the Amazon CloudWatch <code>2010-08-01</code> service release expands Amazon's cloud monitoring offerings with custom alarms.
 447+* **New:** Support for the Amazon CloudWatch `2010-08-01` service release expands Amazon's cloud monitoring offerings with custom alarms.
384448 * **Changed:** The changes made to the `get_metric_statistics()` method are backwards-incompatible with the previous release. The `Namespace` and `Period` parameters are now required and the parameter order has changed.
385449
386450 ### AmazonEMR
@@ -421,6 +485,7 @@
422486 ----
423487
424488 # Changelog: 1.1 "Barret"
 489+<http://finalfantasy.wikia.com/wiki/Barret_Wallace>
425490
426491 Launched Wednesday, November 10, 2010
427492
@@ -502,6 +567,7 @@
503568 ----
504569
505570 # Changelog: 1.0.1 "Aeris"
 571+<http://finalfantasy.wikia.com/wiki/Aerith_Gainsborough>
506572
507573 Launched Tuesday, October 12, 2010
508574
Index: trunk/extensions/OpenStackManager/aws-sdk/sdk.class.php
@@ -102,9 +102,9 @@
103103 // INTERMEDIARY CONSTANTS
104104
105105 define('CFRUNTIME_NAME', 'aws-sdk-php');
106 -define('CFRUNTIME_VERSION', '1.3.5');
 106+define('CFRUNTIME_VERSION', '1.3.7');
107107 // define('CFRUNTIME_BUILD', gmdate('YmdHis', filemtime(__FILE__))); // @todo: Hardcode for release.
108 -define('CFRUNTIME_BUILD', '20110621180731');
 108+define('CFRUNTIME_BUILD', '20110725055831');
109109 define('CFRUNTIME_USERAGENT', CFRUNTIME_NAME . '/' . CFRUNTIME_VERSION . ' PHP/' . PHP_VERSION . ' ' . php_uname('s') . '/' . php_uname('r') . ' Arch/' . php_uname('m') . ' SAPI/' . php_sapi_name() . ' Integer/' . PHP_INT_MAX . ' Build/' . CFRUNTIME_BUILD . __aws_sdk_ua_callback());
110110
111111
@@ -115,7 +115,7 @@
116116 * Core functionality and default settings shared across all SDK classes. All methods and properties in this
117117 * class are inherited by the service-specific classes.
118118 *
119 - * @version 2011.06.07
 119+ * @version 2011.07.12
120120 * @license See the included NOTICE.md file for more information.
121121 * @copyright See the included NOTICE.md file for more information.
122122 * @link http://aws.amazon.com/php/ PHP Developer Center
@@ -829,8 +829,13 @@
830830 {
831831 $query['Action'] = $action;
832832 }
833 - $query['Version'] = $this->api_version;
834833
 834+ // Only add it if it exists.
 835+ if ($this->api_version)
 836+ {
 837+ $query['Version'] = $this->api_version;
 838+ }
 839+
835840 // Only Signature v2
836841 if ($signature_version === 2)
837842 {
@@ -840,6 +845,15 @@
841846 $query['Timestamp'] = $timestamp;
842847 }
843848
 849+ $curlopts = array();
 850+
 851+ // Set custom CURLOPT settings
 852+ if (is_array($opt) && isset($opt['curlopts']))
 853+ {
 854+ $curlopts = $opt['curlopts'];
 855+ unset($opt['curlopts']);
 856+ }
 857+
844858 // Merge in any options that were passed in
845859 if (is_array($opt))
846860 {
@@ -1036,15 +1050,6 @@
10371051 $request->response_class = $this->response_class;
10381052 $request->ssl_verification = $this->ssl_verification;
10391053
1040 - $curlopts = array();
1041 -
1042 - // Set custom CURLOPT settings
1043 - if (is_array($opt) && isset($opt['curlopts']))
1044 - {
1045 - $curlopts = $opt['curlopts'];
1046 - unset($opt['curlopts']);
1047 - }
1048 -
10491054 // Debug mode
10501055 if ($this->debug_mode)
10511056 {

Status & tagging log