Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
amazonwebservices committed Feb 28, 2011
1 parent d8cca53 commit 771dc94
Show file tree
Hide file tree
Showing 31 changed files with 272 additions and 91 deletions.
44 changes: 27 additions & 17 deletions _compatibility_test/sdk_compatibility_test_cli.php
Expand Up @@ -30,6 +30,16 @@
$sqlite3_ok = extension_loaded('sqlite3');
$sqlite_ok = ($pdo_ok && $pdo_sqlite_ok && ($sqlite2_ok || $sqlite3_ok));

function success($s = 'Yes')
{
return "\033[1;37m\033[42m " . $s . " \033[0m";
}

function failure($s = 'No ')
{
return "\033[1;37m\033[41m " . $s . " \033[0m";
}

/////////////////////////////////////////////////////////////////////////

echo PHP_EOL;
Expand All @@ -39,23 +49,23 @@
echo '----------------------------------------' . PHP_EOL;
echo PHP_EOL;

echo 'PHP 5.2 or newer... ' . ($php_ok ? phpversion() : 'No') . PHP_EOL;
echo 'cURL with SSL... ' . ($curl_ok ? ($curl_version['version'] . ' (' . $curl_version['ssl_version'] . ')') : ($curl_version['version'] . (in_array('https', $curl_version['protocols'], true) ? ' (with ' . $curl_version['ssl_version'] . ')' : ' (without SSL)'))) . PHP_EOL;
echo 'Standard PHP Library... ' . ($spl_ok ? 'Yes' : 'No') . PHP_EOL;
echo 'SimpleXML... ' . ($simplexml_ok ? 'Yes' : 'No') . PHP_EOL;
echo 'JSON... ' . ($json_ok ? 'Yes' : 'No') . PHP_EOL;
echo 'PCRE... ' . ($pcre_ok ? 'Yes' : 'No') . PHP_EOL;
echo 'File system read/write... ' . ($file_ok ? 'Yes' : 'No') . PHP_EOL;
echo 'OpenSSL extension... ' . ($openssl_ok ? 'Yes' : 'No') . PHP_EOL;
echo 'Zlib... ' . ($zlib_ok ? 'Yes' : 'No') . PHP_EOL;
echo 'APC... ' . ($apc_ok ? 'Yes' : 'No') . PHP_EOL;
echo 'XCache... ' . ($xcache_ok ? 'Yes' : 'No') . PHP_EOL;
echo 'Memcache... ' . ($memcache_ok ? 'Yes' : 'No') . PHP_EOL;
echo 'Memcached... ' . ($memcached_ok ? 'Yes' : 'No') . PHP_EOL;
echo 'PDO... ' . ($pdo_ok ? 'Yes' : 'No') . PHP_EOL;
echo 'SQLite 2... ' . ($sqlite2_ok ? 'Yes' : 'No') . PHP_EOL;
echo 'SQLite 3... ' . ($sqlite3_ok ? 'Yes' : 'No') . PHP_EOL;
echo 'PDO-SQLite driver... ' . ($pdo_sqlite_ok ? 'Yes' : 'No') . PHP_EOL;
echo 'PHP 5.2 or newer... ' . ($php_ok ? (success() . ' ' . phpversion()) : failure()) . PHP_EOL;
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;
echo 'Standard PHP Library... ' . ($spl_ok ? success() : failure()) . PHP_EOL;
echo 'SimpleXML... ' . ($simplexml_ok ? success() : failure()) . PHP_EOL;
echo 'JSON... ' . ($json_ok ? success() : failure()) . PHP_EOL;
echo 'PCRE... ' . ($pcre_ok ? success() : failure()) . PHP_EOL;
echo 'File system read/write... ' . ($file_ok ? success() : failure()) . PHP_EOL;
echo 'OpenSSL extension... ' . ($openssl_ok ? success() : failure()) . PHP_EOL;
echo 'Zlib... ' . ($zlib_ok ? success() : failure()) . PHP_EOL;
echo 'APC... ' . ($apc_ok ? success() : failure()) . PHP_EOL;
echo 'XCache... ' . ($xcache_ok ? success() : failure()) . PHP_EOL;
echo 'Memcache... ' . ($memcache_ok ? success() : failure()) . PHP_EOL;
echo 'Memcached... ' . ($memcached_ok ? success() : failure()) . PHP_EOL;
echo 'PDO... ' . ($pdo_ok ? success() : failure()) . PHP_EOL;
echo 'SQLite 2... ' . ($sqlite2_ok ? success() : failure()) . PHP_EOL;
echo 'SQLite 3... ' . ($sqlite3_ok ? success() : failure()) . PHP_EOL;
echo 'PDO-SQLite driver... ' . ($pdo_sqlite_ok ? success() : failure()) . PHP_EOL;
echo PHP_EOL;

echo '----------------------------------------' . PHP_EOL;
Expand Down
30 changes: 30 additions & 0 deletions _docs/CHANGELOG.md
@@ -1,3 +1,33 @@
# Changelog: 1.2.1 "Dio"

Launched Friday, January 14, 2010


## New Features & Highlights (Summary)
* Support for S3 Response Headers has been added to the SDK.
* Bug fixes and enhancements:
* [copy_object failed between regions](https://forums.aws.amazon.com/thread.jspa?threadID=56893)
* [Possible S3 bug with multiple buckets?](https://forums.aws.amazon.com/thread.jspa?threadID=56561)

## Service Classes
### AmazonS3
* **New:** Support for S3 Response Headers has been added to the SDK.
* **New:** Documentation for Amazon S3 has been updated to include large object support details.
* **New:** The `abort_multipart_uploads_by_date()` method has been added to the SDK, which aborts multipart uploads that were initiated before a specific date.
* **Fixed:** Resolved an issue where the resource prefix wasn't being reset correctly.

## Utility classes
### CFArray
* **New:** Instantiating the class without passing an array will use an empty array instead.
* **New:** Added the `compress()` method which removes null values from the array.
* **New:** Added the `reindex()` method which reindexes all array elements starting at zero.

## Compatibility Test
* **New:** The command-line compatibility test now color-codes the responses.


----

# Changelog: 1.2 "Cloud"

Launched Friday, December 3, 2010
Expand Down
7 changes: 4 additions & 3 deletions _docs/CONTRIBUTORS.md
Expand Up @@ -2,17 +2,17 @@

## AWS SDK for PHP Contributors

Contributions were provided under the Apache 2.0 License, as appropriate.
Contributions were provided under the Apache 2.0 License, as appropriate, unless otherwise specified.

The following people have provided ideas, support and bug fixes:

* [antischnorrer](http://developer.amazonwebservices.com/connect/profile.jspa?userID=152443) (bug fixes)
* [arech8](http://developer.amazonwebservices.com/connect/profile.jspa?userID=154435) (bug fixes)
* [Jeremy Archuleta](http://code.google.com/u/jeremy.archuleta/) (bug fixes)
* [Paul Voegler](http://developer.amazonwebservices.com/connect/profile.jspa?userID=152443) (bug fixes, bug reports)
* [Peter Bowen](http://github.com/pzb) (feedback, bug reports)


## CloudFusion Contributors
## CloudFusion/CacheCore/RequestCore Contributors

Contributions were provided under the New BSD License, as appropriate.

Expand Down Expand Up @@ -47,6 +47,7 @@ The following people have provided ideas, support and bug fixes:
* [nickgsuperstar](http://code.google.com/u/nickgsuperstar/) (bug fixes)
* [ofpichon](http://code.google.com/u/ofpichon/) (bug fixes)
* [Otavio Ferreira](http://otaviofff.me) (bug fixes)
* [Paul Voegler](http://developer.amazonwebservices.com/connect/profile.jspa?userID=152443) (bug fixes, bug reports, Simplifed BSD-licensed patches)
* [Steve Brozosky](http://code.google.com/u/@UBZWSlJVBxhHXAN1/) (bug fixes)
* [Steve Chu](http://stevechu.org) (bug fixes)
* [tommusic](http://code.google.com/u/tommusic/) (bug fixes)
Expand Down
2 changes: 1 addition & 1 deletion _docs/NOTICE.md
Expand Up @@ -9,7 +9,7 @@ See below for complete copyright and licensing notices.

<http://aws.amazon.com/php>

Copyright 2010 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License").
You may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions lib/requestcore/requestcore.class.php
Expand Up @@ -633,8 +633,8 @@ public function prep_request()
curl_setopt($curl_handle, CURLOPT_NOSIGNAL, true);
curl_setopt($curl_handle, CURLOPT_REFERER, $this->request_url);
curl_setopt($curl_handle, CURLOPT_USERAGENT, $this->useragent);
curl_setopt($curl_handle, CURLOPT_LOW_SPEED_LIMIT, 1);
curl_setopt($curl_handle, CURLOPT_LOW_SPEED_TIME, 10);
// curl_setopt($curl_handle, CURLOPT_LOW_SPEED_LIMIT, 1);
// curl_setopt($curl_handle, CURLOPT_LOW_SPEED_TIME, 10);
curl_setopt($curl_handle, CURLOPT_READFUNCTION, array($this, 'streaming_read_callback'));

// Enable a proxy connection if requested.
Expand Down
8 changes: 4 additions & 4 deletions sdk.class.php
@@ -1,6 +1,6 @@
<?php
/*
* Copyright 2010 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand All @@ -19,7 +19,7 @@
* Core functionality and default settings shared across all SDK classes. All methods and properties in this class are inherited by the service-specific classes.
*
* Version:
* 2010.12.03
* 2011.01.14
*
* License and Copyright:
* See the included NOTICE.md file for more information.
Expand Down Expand Up @@ -117,9 +117,9 @@ function __aws_sdk_ua_callback()
// INTERMEDIARY CONSTANTS

define('CFRUNTIME_NAME', 'aws-sdk-php');
define('CFRUNTIME_VERSION', '1.2');
define('CFRUNTIME_VERSION', '1.2.1');
// define('CFRUNTIME_BUILD', gmdate('YmdHis', filemtime(__FILE__))); // @todo: Hardcode for release.
define('CFRUNTIME_BUILD', '20101203002835');
define('CFRUNTIME_BUILD', '20110114203033');
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());


Expand Down
4 changes: 2 additions & 2 deletions services/as.class.php
@@ -1,6 +1,6 @@
<?php
/*
* Copyright 2010 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand All @@ -26,7 +26,7 @@
* will automatically redistribute applications to a different Availability Zone.
*
* Version:
* Fri Dec 03 16:22:08 PST 2010
* Fri Jan 14 12:13:57 PST 2011
*
* License and Copyright:
* See the included NOTICE.md file for complete information.
Expand Down
2 changes: 1 addition & 1 deletion services/cloudfront.class.php
@@ -1,6 +1,6 @@
<?php
/*
* Copyright 2010 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions services/cloudwatch.class.php
@@ -1,6 +1,6 @@
<?php
/*
* Copyright 2010 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down Expand Up @@ -29,7 +29,7 @@
* that initiate Auto Scaling and Simple Notification Service actions on your behalf.
*
* Version:
* Fri Dec 03 16:23:21 PST 2010
* Fri Jan 14 12:14:39 PST 2011
*
* License and Copyright:
* See the included NOTICE.md file for complete information.
Expand Down
4 changes: 2 additions & 2 deletions services/ec2.class.php
@@ -1,6 +1,6 @@
<?php
/*
* Copyright 2010 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,7 +30,7 @@
* Visit [http://aws.amazon.com/ec2/](http://aws.amazon.com/ec2/) for more information.
*
* Version:
* Fri Dec 03 16:23:55 PST 2010
* Fri Jan 14 12:16:29 PST 2011
*
* License and Copyright:
* See the included NOTICE.md file for complete information.
Expand Down
4 changes: 2 additions & 2 deletions services/elb.class.php
@@ -1,6 +1,6 @@
<?php
/*
* Copyright 2010 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand All @@ -22,7 +22,7 @@
* redundancy and supports traffic growth of your application.
*
* Version:
* Fri Dec 03 16:24:35 PST 2010
* Fri Jan 14 12:17:50 PST 2011
*
* License and Copyright:
* See the included NOTICE.md file for complete information.
Expand Down
4 changes: 2 additions & 2 deletions services/emr.class.php
@@ -1,6 +1,6 @@
<?php
/*
* Copyright 2010 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand All @@ -20,7 +20,7 @@
* detailed information about the Amazon Elastic MapReduce APIs.
*
* Version:
* Fri Dec 03 16:25:08 PST 2010
* Fri Jan 14 12:20:15 PST 2011
*
* License and Copyright:
* See the included NOTICE.md file for complete information.
Expand Down
4 changes: 2 additions & 2 deletions services/importexport.class.php
@@ -1,6 +1,6 @@
<?php
/*
* Copyright 2010 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand All @@ -24,7 +24,7 @@
* upgrading your connectivity.
*
* Version:
* Fri Dec 03 16:26:16 PST 2010
* Fri Jan 14 12:22:14 PST 2011
*
* License and Copyright:
* See the included NOTICE.md file for complete information.
Expand Down
4 changes: 2 additions & 2 deletions services/rds.class.php
@@ -1,6 +1,6 @@
<?php
/*
* Copyright 2010 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down Expand Up @@ -29,7 +29,7 @@
* Amazon Web Services, there are no up-front investments, and you pay only for the resources you use.
*
* Version:
* Fri Dec 03 16:26:47 PST 2010
* Fri Jan 14 12:22:49 PST 2011
*
* License and Copyright:
* See the included NOTICE.md file for complete information.
Expand Down

0 comments on commit 771dc94

Please sign in to comment.