Skip to content
This repository has been archived by the owner on Jul 22, 2021. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremeamia authored and skyzyx committed Oct 31, 2012
1 parent 26ea889 commit ed94df6
Show file tree
Hide file tree
Showing 15 changed files with 506 additions and 157 deletions.
30 changes: 28 additions & 2 deletions _docs/CHANGELOG.md
@@ -1,10 +1,36 @@
# Changelog: 1.5.15 "Quixote"
"Rocinante" (Don Quixote's horse) was the code name for the PowerMac Upgrade enabler. <http://applemuseum.bott.org/sections/codenames.html>

Launched Wednesday, September 26, 2012.

## Bug fixes and enhancements
* **Fixed:** SignatureV4 implementation now correctly collapses consecutive whitespace within headers to match the spec.
* **Fixed:** [Improve error message when backticks fail](https://github.com/amazonwebservices/aws-sdk-for-php/pull/31)
* **Fixed:** [Fixed invalid detection of MIME type with upper case file extensions](https://github.com/amazonwebservices/aws-sdk-for-php/pull/33)
* **Fixed:** [prevent notice for unfound keys on s3](https://github.com/amazonwebservices/aws-sdk-for-php/pull/34)
* **Fixed:** [Optimization of set_time_limit() call](https://github.com/amazonwebservices/aws-sdk-for-php/pull/36)
* **Fixed:** [Fallback for config will work correctly when having to determine the HOME directory](https://github.com/amazonwebservices/aws-sdk-for-php/pull/38)
* **Fixed:** [Fixed circular to string method in simplexml](https://github.com/amazonwebservices/aws-sdk-for-php/pull/39)
* **Fixed:** [Fixed E_NOTICE being raised by AmazonDynamoDB->attributes()](https://github.com/amazonwebservices/aws-sdk-for-php/pull/40)
* **Fixed:** [Fix bug caused by some SSL implementations with bucket names that have dots in them](https://github.com/amazonwebservices/aws-sdk-for-php/pull/42)

## Services
### AmazonAS
* **New:** Support for termination policies for Auto Scaling groups has been added to the SDK.

### AmazonEC2
* **New:** Support for Reserved Instance Marketplace for Amazon EC2 has been added to the SDK.
* **New:** Support for static routing configurations (non-BGP) for Amazon VPC has been added to the SDK.

----

# Changelog: 1.5.14 "Panther"
Code name for Mac OS X 10.3. <http://en.wikipedia.org/wiki/Mac_OS_X_v10.3>

Launched Wednesday. August 31, 2012.
Launched Wednesday, August 29, 2012.

## Services
### Amazon S3
### AmazonS3
* **New:** Support for Cross-Origin Resource Sharing (CORS) configuration on buckets

----
Expand Down
8 changes: 7 additions & 1 deletion _docs/CONTRIBUTORS.md
Expand Up @@ -8,19 +8,25 @@ The following people have provided ideas, support and bug fixes:

* [arech8](http://developer.amazonwebservices.com/connect/profile.jspa?userID=154435) (bug fixes)
* [Aizat Faiz](http://aizatto.com) (bug fixes)
* [Adam Monsen](https://github.com/meonkeys) (bug fixes)
* [Alan Pinstein](https://github.com/apinstein) (bug fixes)
* [Ben Lumley](http://github.com/benlumley) (bug fixes)
* [Brady Doll](https://github.com/bradydoll) (bug fixes)
* [Dan Stillman](https://github.com/dstillman) (bug fixes)
* [Daniel Holmes](https://github.com/danielholmes) (bug fixes)
* [David Chan](http://www.chandeeland.org) (bug fixes)
* [Eric Caron](http://www.ericcaron.com) (bug fixes)
* [Jason Ardell](http://ardell.posterous.com/) (bug fixes)
* [Jeremy Archuleta](http://code.google.com/u/jeremy.archuleta/) (bug fixes)
* [Jimmy Berry](http://blog.boombatower.com/) (bug fixes, patches)
* [Jarrod Swift](https://github.com/jswift) (bg fixes)
* [Richard Quadling](https://github.com/RichardQuadling) (bug fixes)
* [Paul Voegler](mailto:voegler@gmx.de) (bug fixes, bug reports, patches)
* [Peter Bowen](http://github.com/pzb) (feedback, bug reports)
* [Robin Speekenbrink](https://github.com/fruitl00p) (bug fixes)
* [Roman Cambian](https://github.com/rcambien) (patches)
* [zoxa](https://github.com/zoxa) (bug fixes)

* [ziege](https://github.com/ziege) (bug fixes)

## CloudFusion/CacheCore/RequestCore Contributors

Expand Down
5 changes: 2 additions & 3 deletions authentication/signature_v4json.class.php
Expand Up @@ -155,12 +155,11 @@ public function authenticate()
// Add headers to request and compute the string to sign
foreach ($this->headers as $header_key => $header_value)
{
// Strip linebreaks from header values as they're illegal and can allow for security issues
$header_value = str_replace(array("\r", "\n"), '', $header_value);
// Strip line breaks and remove consecutive spaces. Services collapse whitespace in signature calculation
$header_value = preg_replace('/\s+/', ' ', trim($header_value));

$request->add_header($header_key, $header_value);
$this->canonical_headers[] = strtolower($header_key) . ':' . $header_value;

$this->signed_headers[] = strtolower($header_key);
}

Expand Down
5 changes: 2 additions & 3 deletions authentication/signature_v4query.class.php
Expand Up @@ -149,12 +149,11 @@ public function authenticate()
// Add headers to request and compute the string to sign
foreach ($this->headers as $header_key => $header_value)
{
// Strip linebreaks from header values as they're illegal and can allow for security issues
$header_value = str_replace(array("\r", "\n"), '', $header_value);
// Strip line breaks and remove consecutive spaces. Services collapse whitespace in signature calculation
$header_value = preg_replace('/\s+/', ' ', trim($header_value));

$request->add_header($header_key, $header_value);
$this->canonical_headers[] = strtolower($header_key) . ':' . $header_value;

$this->signed_headers[] = strtolower($header_key);
}

Expand Down
3 changes: 2 additions & 1 deletion extensions/dynamodbsessionhandler.class.php
Expand Up @@ -298,7 +298,8 @@ public function read($id)
{
foreach ($response->body->{$node_name}->children() as $key => $value)
{
$item[$key] = (string) current($value);
$type = $value->children()->getName();
$item[$key] = $value->{$type}->to_string();
}
}

Expand Down
18 changes: 4 additions & 14 deletions lib/cachecore/cachefile.class.php
Expand Up @@ -3,7 +3,7 @@
* Container for all file-based cache methods. Inherits additional methods from <CacheCore>. Adheres
* to the ICacheCore interface.
*
* @version 2012.05.25
* @version 2012.04.17
* @copyright 2006-2012 Ryan Parman
* @copyright 2006-2010 Foleeo, Inc.
* @copyright 2012 Amazon.com, Inc. or its affiliates.
Expand Down Expand Up @@ -50,12 +50,7 @@ public function create($data)
$data = serialize($data);
$data = $this->gzip ? gzcompress($data) : $data;

$result = (
(bool) file_put_contents($this->id, $data) &&
touch($this->id, time() + (integer) $this->expires)
);

return $result;
return (bool) file_put_contents($this->id, $data);
}
elseif (realpath($this->location) && file_exists($this->location))
{
Expand Down Expand Up @@ -113,12 +108,7 @@ public function update($data)
$data = serialize($data);
$data = $this->gzip ? gzcompress($data) : $data;

$result = (
(bool) file_put_contents($this->id, $data) &&
touch($this->id, time() + (integer) $this->expires)
);

return $result;
return (bool) file_put_contents($this->id, $data);
}
else
{
Expand Down Expand Up @@ -150,7 +140,7 @@ public function delete()
*/
public function is_expired()
{
if ((integer) $this->timestamp() < time())
if ($this->timestamp() + $this->expires < time())
{
return true;
}
Expand Down
21 changes: 19 additions & 2 deletions lib/requestcore/requestcore.class.php
Expand Up @@ -156,6 +156,11 @@ class RequestCore
*/
public $registered_streaming_write_callback = null;

/**
* Whether or not the set_time_limit function should be called.
*/
public $allow_set_time_limit = true;


/*%******************************************************************************************%*/
// CONSTANTS
Expand Down Expand Up @@ -205,6 +210,12 @@ public function __construct($url = null, $proxy = null, $helpers = null)
$this->request_headers = array();
$this->request_body = '';

// Determine if set_time_limit can be called
if (strpos(ini_get('disable_functions'), 'set_time_limit') !== false)
{
$this->allow_set_time_limit = false;
}

// Set a new Request class if one was set.
if (isset($helpers['request']) && !empty($helpers['request']))
{
Expand Down Expand Up @@ -819,7 +830,10 @@ public function process_response($curl_handle = null, $response = null)
*/
public function send_request($parse = false)
{
set_time_limit(0);
if ($this->allow_set_time_limit)
{
set_time_limit(0);
}

$curl_handle = $this->prep_request();
$this->response = curl_exec($curl_handle);
Expand Down Expand Up @@ -852,7 +866,10 @@ public function send_request($parse = false)
*/
public function send_multi_request($handles, $opt = null)
{
set_time_limit(0);
if ($this->allow_set_time_limit)
{
set_time_limit(0);
}

// Skip everything if there are no handles to process.
if (count($handles) === 0) return array();
Expand Down

0 comments on commit ed94df6

Please sign in to comment.