Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add default CURLOPT_TIMEOUT parameter. #91

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −0
Open

Add default CURLOPT_TIMEOUT parameter. #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions S3.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,15 @@ class S3
*/
private static $__signingKeyResource = false;

/**
* curl timeout
*
* @var int
* @access public
* @static
*/
public static $curlTimeout = 60;


/**
* Constructor - if you're not using the class statically
Expand Down Expand Up @@ -336,6 +345,16 @@ public static function freeSigningKey()
openssl_free_key(self::$__signingKeyResource);
}

/**
* Sets the curl timeout from the default of 60 seconds (use 0 for no timeout)
*
* @return void
*/
public static function setTimeout($timeout)
{
self::$curlTimeout = $timeout;
}


/**
* Internal error handler
Expand Down Expand Up @@ -2178,6 +2197,7 @@ public function getResponse()
curl_setopt($curl, CURLOPT_WRITEFUNCTION, array(&$this, '__responseWriteCallback'));
curl_setopt($curl, CURLOPT_HEADERFUNCTION, array(&$this, '__responseHeaderCallback'));
curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($curl, CURLOPT_TIMEOUT, S3::$curlTimeout);

// Request types
switch ($this->verb)
Expand Down