Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
amazonwebservices committed Jul 13, 2011
1 parent 7e93c6c commit a0dde0e
Show file tree
Hide file tree
Showing 20 changed files with 253 additions and 52 deletions.
25 changes: 24 additions & 1 deletion _compatibility_test/sdk_compatibility_test.php
Expand Up @@ -42,6 +42,7 @@
$sqlite2_ok = extension_loaded('sqlite');
$sqlite3_ok = extension_loaded('sqlite3');
$sqlite_ok = ($pdo_ok && $pdo_sqlite_ok && ($sqlite2_ok || $sqlite3_ok));
$int64_ok = (PHP_INT_MAX === 9223372036854775807);

header('Content-type: text/html; charset=UTF-8');

Expand Down Expand Up @@ -321,10 +322,28 @@
</tbody>
</table>

<h3>Other</h3>
<table cellpadding="0" cellspacing="0" border="0" width="100%" id="chart">
<thead>
<tr>
<th>Test</th>
<th>Would Like To Be</th>
<th>What You Have</th>
</tr>
</thead>
<tbody>
<tr class="<?php echo ($int64_ok) ? 'enabled' : 'disabled'; ?>">
<td><a href="https://aws.amazon.com/amis/4158">Architecture</a></td>
<td>64-bit</td>
<td><?php echo ($int64_ok) ? '64-bit' : '32-bit'; ?></td>
</tr>
</tbody>
</table>

<br>
</div>

<?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)): ?>
<?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)): ?>
<div class="chunk important ok">
<h3>Bottom Line: Yes, you can!</h3>
<p>Your PHP environment is ready to go, and can take advantage of all possible features!</p>
Expand Down Expand Up @@ -370,6 +389,10 @@
<li>The <a href="http://php.net/zlib">Zlib</a> extension is installed. The SDK will automatically leverage the compression capabilities of Zlib.</li>
<?php endif; ?>

<?php if (!$int64_ok): ?>
<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>
<?php endif; ?>

<?php
$storage_types = array();
if ($file_ok) { $storage_types[] = '<a href="http://php.net/file_put_contents">The file system</a>'; }
Expand Down
5 changes: 4 additions & 1 deletion _compatibility_test/sdk_compatibility_test_cli.php
Expand Up @@ -17,6 +17,7 @@
// Optional, but recommended
$openssl_ok = (extension_loaded('openssl') && function_exists('openssl_sign'));
$zlib_ok = extension_loaded('zlib');
$int64_ok = (PHP_INT_MAX === 9223372036854775807);

// Optional
$apc_ok = extension_loaded('apc');
Expand Down Expand Up @@ -50,6 +51,7 @@ function failure($s = 'No ')
echo PHP_EOL;

echo 'PHP 5.2 or newer... ' . ($php_ok ? (success() . ' ' . phpversion()) : failure()) . PHP_EOL;
echo 'Architecture... ' . ($int64_ok ? success('64-bit') : failure('32-bit')) . 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;
Expand Down Expand Up @@ -77,6 +79,7 @@ function failure($s = 'No ')
echo 'Your environment meets the minimum requirements for using the AWS SDK for PHP!' . PHP_EOL . PHP_EOL;
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; }
if ($zlib_ok) { echo '* The Zlib extension is installed. The SDK will automatically leverage the compression capabilities of Zlib.' . PHP_EOL . PHP_EOL; }
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; }

$storage_types = array();
if ($file_ok) { $storage_types[] = 'The file system'; }
Expand Down Expand Up @@ -105,7 +108,7 @@ function failure($s = 'No ')
echo '----------------------------------------' . PHP_EOL;
echo PHP_EOL;

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))
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))
{
echo 'Bottom Line: Yes, you can!' . PHP_EOL;
echo 'Your PHP environment is ready to go, and can take advantage of all possible features!' . PHP_EOL;
Expand Down
56 changes: 53 additions & 3 deletions _docs/CHANGELOG.md
@@ -1,4 +1,41 @@
# Changelog: "Nero"
# Changelog: 1.3.6 "Penelo"
<http://finalfantasy.wikia.com/wiki/Penelo>

Launched Tuesday, July 12, 2011

## Bug fixes and enhancements
* [[Bug Report] rawurlencode error when using SES and curlopts](https://forums.aws.amazon.com/thread.jspa?threadID=68484)

## Service Classes
### AmazonCloudFormation
* **New:** Support for the `list_stacks()` method has been added to the SDK.

### AmazonElasticBeanstalk
* **New:** Support for the `swap_environment_cnames()` method has been added to the SDK.

### AmazonS3
* **Fixed:** Additional information about maximum open connections has been added to the `create_mpu_object()` method.

## Compatibility Test
* **New:** Now tests whether the system is 64- or 32-bit.


----

# Changelog: 1.3.5 "Occuria"
<http://finalfantasy.wikia.com/wiki/Occuria>

Launched Tuesday, June 21, 2011

## Service Classes
### AmazonS3
* **New:** Support for S3 copy part has been added to the SDK.


----

# Changelog: 1.3.4 "Nero"
<http://finalfantasy.wikia.com/wiki/Nero>

Launched Tuesday, June 7, 2011

Expand Down Expand Up @@ -30,6 +67,7 @@ Launched Tuesday, June 7, 2011
----

# Changelog: 1.3.3 "Moogle"
<http://finalfantasy.wikia.com/wiki/Moogle>

Launched Tuesday, May 10, 2011

Expand Down Expand Up @@ -80,6 +118,7 @@ Launched Tuesday, May 10, 2011
----

# Changelog: 1.3.2 "Luna"
<http://finalfantasy.wikia.com/wiki/Luna_Wolf>

Launched Tuesday, April 5, 2011

Expand All @@ -100,6 +139,7 @@ Launched Tuesday, April 5, 2011
----

# Changelog: 1.3.1 "Kraken"
<http://finalfantasy.wikia.com/wiki/Kraken>

Launched Friday, March 25, 2011

Expand Down Expand Up @@ -131,6 +171,7 @@ Launched Friday, March 25, 2011
----

# Changelog: 1.3 "Jecht"
<http://finalfantasy.wikia.com/wiki/Jecht>

Launched Tuesday, March 15, 2011

Expand All @@ -146,7 +187,7 @@ Launched Tuesday, March 15, 2011
* **Fixed:** The `$image_location` parameter in the `register_image()` method is no longer required. This is a backwards-incompatible change.

### AmazonS3
* **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.
* **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.


## Utility classes
Expand All @@ -171,6 +212,7 @@ Launched Tuesday, March 15, 2011
----

# Changelog: 1.2.6 "Ifrit"
<http://finalfantasy.wikia.com/wiki/Ifrit>

Launched Wednesday, March 2, 2011

Expand Down Expand Up @@ -228,6 +270,7 @@ Launched Wednesday, March 2, 2011
----

# Changelog: 1.2.5 "Heidegger"
<http://finalfantasy.wikia.com/wiki/Heidegger>

Launched Thursday, February 24, 2011

Expand All @@ -251,6 +294,7 @@ Launched Thursday, February 24, 2011
----

# Changelog: 1.2.4 "Goltanna"
<http://finalfantasy.wikia.com/wiki/Druksmald_Goltanna>

Launched Wednesday, February 16, 2011

Expand Down Expand Up @@ -278,6 +322,7 @@ Launched Wednesday, February 16, 2011
----

# Changelog: 1.2.3 "Fayth"
<http://finalfantasy.wikia.com/wiki/Fayth>

Launched Tuesday, January 25, 2010

Expand All @@ -292,6 +337,7 @@ Launched Tuesday, January 25, 2010
----

# Changelog: 1.2.2 "Esper"
<http://finalfantasy.wikia.com/wiki/Esper>

Launched Tuesday, January 18, 2011

Expand All @@ -318,6 +364,7 @@ Launched Tuesday, January 18, 2011
----

# Changelog: 1.2.1 "Dio"
<http://finalfantasy.wikia.com/wiki/Dio>

Launched Friday, January 14, 2011

Expand Down Expand Up @@ -348,6 +395,7 @@ Launched Friday, January 14, 2011
----

# Changelog: 1.2 "Cloud"
<http://finalfantasy.wikia.com/wiki/Cloud_Strife>

Launched Friday, December 3, 2010

Expand Down Expand Up @@ -379,7 +427,7 @@ Launched Friday, December 3, 2010
* **Fixed:** Resolved an issue where the incorrect formatting of an XML element prevented the ability to update the list of trusted signers.

### AmazonCloudWatch
* **New:** Support for the Amazon CloudWatch <code>2010-08-01</code> service release expands Amazon's cloud monitoring offerings with custom alarms.
* **New:** Support for the Amazon CloudWatch `2010-08-01` service release expands Amazon's cloud monitoring offerings with custom alarms.
* **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.

### AmazonEMR
Expand Down Expand Up @@ -421,6 +469,7 @@ Launched Friday, December 3, 2010
----

# Changelog: 1.1 "Barret"
<http://finalfantasy.wikia.com/wiki/Barret_Wallace>

Launched Wednesday, November 10, 2010

Expand Down Expand Up @@ -502,6 +551,7 @@ Launched Wednesday, November 10, 2010
----

# Changelog: 1.0.1 "Aeris"
<http://finalfantasy.wikia.com/wiki/Aerith_Gainsborough>

Launched Tuesday, October 12, 2010

Expand Down
20 changes: 20 additions & 0 deletions config-sample.inc.php
Expand Up @@ -52,6 +52,26 @@
*/
define('AWS_CERTIFICATE_AUTHORITY', false);

/**
* This option allows you to configure a preferred storage type to use for caching by default. This can
* be changed later using the set_cache_config() method.
*
* Valid values are: `apc`, `xcache`, a DSN-style string such as `pdo.sqlite:/sqlite/cache.db`, a file
* system path such as `./cache` or `/tmp/cache/`, or a serialized array for memcached configuration.
*
* serialize(array(
* array(
* 'host' => '127.0.0.1',
* 'port' => '11211'
* ),
* array(
* 'host' => '127.0.0.2',
* 'port' => '11211'
* )
* ));
*/
define('AWS_DEFAULT_CACHE_CONFIG', '');

/**
* 12-digit serial number taken from the Gemalto device used for Multi-Factor Authentication. Ignore this
* if you're not using MFA.
Expand Down
3 changes: 0 additions & 3 deletions lib/requestcore/cacert.pem
Expand Up @@ -14,9 +14,6 @@
## Just configure this file as the SSLCACertificateFile.
##

# Ryan Parman elects to use cacert.pem under the Mozilla Public License, version 1.1.
# Amazon elects to use cacert.pem under the Mozilla Public License, version 1.1.
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
Expand Down

0 comments on commit a0dde0e

Please sign in to comment.