http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99831
Revision: 99831
Author: reedy
Date: 2011-10-14 23:50:18 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
aws-sdk 1.4.4
Modified Paths:
--------------
trunk/extensions/OpenStackManager/aws-sdk/_docs/CHANGELOG.md
trunk/extensions/OpenStackManager/aws-sdk/sdk.class.php
trunk/extensions/OpenStackManager/aws-sdk/services/s3.class.php
Modified: trunk/extensions/OpenStackManager/aws-sdk/_docs/CHANGELOG.md
===================================================================
--- trunk/extensions/OpenStackManager/aws-sdk/_docs/CHANGELOG.md
2011-10-14 23:29:49 UTC (rev 99830)
+++ trunk/extensions/OpenStackManager/aws-sdk/_docs/CHANGELOG.md
2011-10-14 23:50:18 UTC (rev 99831)
@@ -1,3 +1,18 @@
+# Changelog: 1.4.4 "Vaan"
+<http://finalfantasy.wikia.com/wiki/Vaan>
+
+Launched Tuesday, October 12, 2011
+
+## Runtime
+* **Fixed:** Resolved an issue where a segmentation fault is triggererd when
there are multiple autoloaders in the stack and one of them doesn't return a
value.
+
+## Service Classes
+### AmazonS3
+* **New:** Support for server-side encryption has been added to the SDK.
+
+
+----
+
# Changelog: 1.4.3 "Ultros"
<http://finalfantasy.wikia.com/wiki/Ultros>
Modified: trunk/extensions/OpenStackManager/aws-sdk/sdk.class.php
===================================================================
--- trunk/extensions/OpenStackManager/aws-sdk/sdk.class.php 2011-10-14
23:29:49 UTC (rev 99830)
+++ trunk/extensions/OpenStackManager/aws-sdk/sdk.class.php 2011-10-14
23:50:18 UTC (rev 99831)
@@ -125,9 +125,9 @@
// INTERMEDIARY CONSTANTS
define('CFRUNTIME_NAME', 'aws-sdk-php');
-define('CFRUNTIME_VERSION', '1.4.3');
+define('CFRUNTIME_VERSION', '1.4.4');
// define('CFRUNTIME_BUILD', gmdate('YmdHis', filemtime(__FILE__))); // @todo:
Hardcode for release.
-define('CFRUNTIME_BUILD', '20110930191027');
+define('CFRUNTIME_BUILD', '20111012191027');
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());
@@ -1574,6 +1574,8 @@
{
require_once($path);
}
+
+ return true;
}
}
Modified: trunk/extensions/OpenStackManager/aws-sdk/services/s3.class.php
===================================================================
--- trunk/extensions/OpenStackManager/aws-sdk/services/s3.class.php
2011-10-14 23:29:49 UTC (rev 99830)
+++ trunk/extensions/OpenStackManager/aws-sdk/services/s3.class.php
2011-10-14 23:50:18 UTC (rev 99831)
@@ -1169,6 +1169,8 @@
* <li><code>fileUpload</code> - <code>string|resource</code> -
Required; Conditional - The URL/path for the file to upload, or an open
resource. Either this parameter or <code>body</code> is required.</li>
* <li><code>acl</code> - <code>string</code> - Optional - The ACL
settings for the specified object. [Allowed values:
<code>AmazonS3::ACL_PRIVATE</code>, <code>AmazonS3::ACL_PUBLIC</code>,
<code>AmazonS3::ACL_OPEN</code>, <code>AmazonS3::ACL_AUTH_READ</code>,
<code>AmazonS3::ACL_OWNER_READ</code>,
<code>AmazonS3::ACL_OWNER_FULL_CONTROL</code>]. The default value is
<code>ACL_PRIVATE</code>.</li>
* <li><code>contentType</code> - <code>string</code> - Optional -
The type of content that is being sent in the body. If a file is being uploaded
via <code>fileUpload</code> as a file system path, it will attempt to determine
the correct mime-type based on the file extension. The default value is
<code>application/octet-stream</code>.</li>
+ * <li><code>contentType</code> - <code>string</code> - Optional -
The type of content that is being sent in the body. If a file is being uploaded
via <code>fileUpload</code> as a file system path, it will attempt to determine
the correct mime-type based on the file extension. The default value is
<code>application/octet-stream</code>.</li>
+ * <li><code>encryption</code> - <code>string</code> - Optional -
The algorithm to use for encrypting the object. [Allowed values:
<code>AES256</code>]</li>
* <li><code>headers</code> - <code>array</code> - Optional - The
standard HTTP headers to send along in the request.</li>
* <li><code>length</code> - <code>integer</code> - Optional - The
size of the object in bytes. For more information, see <a
href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.13";>RFC
2616, section 14.13</a>. The value can also be passed to the
<code>header</code> option as <code>Content-Length</code>.</li>
* <li><code>meta</code> - <code>array</code> - Optional - An
associative array of key-value pairs. Represented by <code>x-amz-meta-:</code>.
Any header starting with this prefix is considered user metadata. It will be
stored with the object and returned when you retrieve the object. The total
size of the HTTP request, not including the body, must be less than 4 KB.</li>
@@ -1215,6 +1217,13 @@
unset($opt['storage']);
}
+ // Handle encryption settings. Can also be passed as an HTTP
header.
+ if (isset($opt['encryption']))
+ {
+ $opt['headers']['x-amz-server-side-encryption'] =
$opt['encryption'];
+ unset($opt['encryption']);
+ }
+
// Handle meta tags. Can also be passed as an HTTP header.
if (isset($opt['meta']))
{
@@ -1394,6 +1403,7 @@
* <li><code>filename</code> - <code>string</code> - Required -
Specifies the file name to copy the object to.</li></ul>
* @param array $opt (Optional) An associative array of parameters that
can have the following keys: <ul>
* <li><code>acl</code> - <code>string</code> - Optional - The ACL
settings for the specified object. [Allowed values:
<code>AmazonS3::ACL_PRIVATE</code>, <code>AmazonS3::ACL_PUBLIC</code>,
<code>AmazonS3::ACL_OPEN</code>, <code>AmazonS3::ACL_AUTH_READ</code>,
<code>AmazonS3::ACL_OWNER_READ</code>,
<code>AmazonS3::ACL_OWNER_FULL_CONTROL</code>]. Alternatively, an array of
associative arrays. Each associative array contains an <code>id</code> and a
<code>permission</code> key. The default value is <code>ACL_PRIVATE</code>.</li>
+ * <li><code>encryption</code> - <code>string</code> - Optional -
The algorithm to use for encrypting the object. [Allowed values:
<code>AES256</code>]</li>
* <li><code>storage</code> - <code>string</code> - Optional -
Whether to use Standard or Reduced Redundancy storage. [Allowed values:
<code>AmazonS3::STORAGE_STANDARD</code>,
<code>AmazonS3::STORAGE_REDUCED</code>]. The default value is
<code>STORAGE_STANDARD</code>.</li>
* <li><code>versionId</code> - <code>string</code> - Optional -
The version of the object to copy. Version IDs are returned in the
<code>x-amz-version-id</code> header of any previous object-related
request.</li>
* <li><code>ifMatch</code> - <code>string</code> - Optional - The
ETag header from a previous request. Copies the object if its entity tag (ETag)
matches the specified tag; otherwise, the request returns a <code>412</code>
HTTP status code error (precondition failed). Used in conjunction with
<code>ifUnmodifiedSince</code>.</li>
@@ -1472,6 +1482,13 @@
unset($opt['storage']);
}
+ // Handle encryption settings. Can also be passed as an HTTP
header.
+ if (isset($opt['encryption']))
+ {
+ $opt['headers']['x-amz-server-side-encryption'] =
$opt['encryption'];
+ unset($opt['encryption']);
+ }
+
// Handle conditional-copy parameters
if (isset($opt['ifMatch']))
{
@@ -2801,6 +2818,7 @@
* @param array $opt (Optional) An associative array of parameters that
can have the following keys: <ul>
* <li><code>acl</code> - <code>string</code> - Optional - The ACL
settings for the specified object. [Allowed values:
<code>AmazonS3::ACL_PRIVATE</code>, <code>AmazonS3::ACL_PUBLIC</code>,
<code>AmazonS3::ACL_OPEN</code>, <code>AmazonS3::ACL_AUTH_READ</code>,
<code>AmazonS3::ACL_OWNER_READ</code>,
<code>AmazonS3::ACL_OWNER_FULL_CONTROL</code>]. The default value is
<code>ACL_PRIVATE</code>.</li>
* <li><code>contentType</code> - <code>string</code> - Optional -
The type of content that is being sent. The default value is
<code>application/octet-stream</code>.</li>
+ * <li><code>encryption</code> - <code>string</code> - Optional -
The algorithm to use for encrypting the object. [Allowed values:
<code>AES256</code>]</li>
* <li><code>headers</code> - <code>array</code> - Optional - The
standard HTTP headers to send along in the request.</li>
* <li><code>meta</code> - <code>array</code> - Optional - An
associative array of key-value pairs. Any header starting with
<code>x-amz-meta-:</code> is considered user metadata. It will be stored with
the object and returned when you retrieve the object. The total size of the
HTTP request, not including the body, must be less than 4 KB.</li>
* <li><code>storage</code> - <code>string</code> - Optional -
Whether to use Standard or Reduced Redundancy storage. [Allowed values:
<code>AmazonS3::STORAGE_STANDARD</code>,
<code>AmazonS3::STORAGE_REDUCED</code>]. The default value is
<code>STORAGE_STANDARD</code>.</li>
@@ -2846,6 +2864,13 @@
unset($opt['storage']);
}
+ // Handle encryption settings. Can also be passed as an HTTP
header.
+ if (isset($opt['encryption']))
+ {
+ $opt['headers']['x-amz-server-side-encryption'] =
$opt['encryption'];
+ unset($opt['encryption']);
+ }
+
// Handle meta tags. Can also be passed as an HTTP header.
if (isset($opt['meta']))
{
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
