diff --git a/.gitignore b/.gitignore index 48b8bf90..00730954 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ vendor/ +nbproject/ \ No newline at end of file diff --git a/S3.php b/S3.php index 83c01733..e39c914d 100644 --- a/S3.php +++ b/S3.php @@ -80,7 +80,7 @@ class S3 * Default delimiter to be used, for example while getBucket(). * @var string * @access public - * @static + * @static */ public static $defDelimiter = null; @@ -127,7 +127,7 @@ class S3 * @access public * @static */ - public static $useSSLVersion = CURL_SSLVERSION_TLSv1; + public static $useSSLVersion = null; // CURL_SSLVERSION_TLSv1; /** * Use PHP exceptions? @@ -153,7 +153,7 @@ class S3 * @static */ public static $sslKey = null; - + /** * SSL client certfificate * @@ -162,7 +162,7 @@ class S3 * @static */ public static $sslCert = null; - + /** * SSL CA cert (only required if you are having problems with your system CA cert) * @@ -171,7 +171,7 @@ class S3 * @static */ public static $sslCACert = null; - + /** * AWS Key Pair ID * @@ -180,13 +180,13 @@ class S3 * @static */ private static $__signingKeyPairId = null; - + /** * Key resource, freeSigningKey() must be called to clear it from memory * * @var bool * @access private - * @static + * @static */ private static $__signingKeyResource = false; @@ -319,7 +319,7 @@ public static function setTimeCorrectionOffset($offset = 0) $rest = new S3Request('HEAD'); $rest = $rest->getResponse(); $awstime = $rest->headers['date']; - $systime = time(); + $systime = time(); $offset = $systime > $awstime ? -($systime - $awstime) : ($awstime - $systime); } self::$__timeOffset = $offset; @@ -1827,7 +1827,7 @@ private static function __getMIMEType(&$file) 'jpg' => 'image/jpeg', 'jpeg' => 'image/jpeg', 'gif' => 'image/gif', 'png' => 'image/png', 'ico' => 'image/x-icon', 'pdf' => 'application/pdf', 'tif' => 'image/tiff', 'tiff' => 'image/tiff', 'svg' => 'image/svg+xml', - 'svgz' => 'image/svg+xml', 'swf' => 'application/x-shockwave-flash', + 'svgz' => 'image/svg+xml', 'swf' => 'application/x-shockwave-flash', 'zip' => 'application/zip', 'gz' => 'application/x-gzip', 'tar' => 'application/x-tar', 'bz' => 'application/x-bzip', 'bz2' => 'application/x-bzip2', 'rar' => 'application/x-rar-compressed', @@ -1910,7 +1910,7 @@ private static function __getHash($string) } /** - * S3 Request class + * S3 Request class * * @link http://undesigned.org.za/2007/10/22/amazon-s3-php-class * @version 0.5.0-dev @@ -1924,7 +1924,7 @@ final class S3Request * @access private */ private $endpoint; - + /** * Verb * @@ -1932,7 +1932,7 @@ final class S3Request * @access private */ private $verb; - + /** * S3 bucket name * @@ -1940,7 +1940,7 @@ final class S3Request * @access private */ private $bucket; - + /** * Object URI * @@ -1948,7 +1948,7 @@ final class S3Request * @access private */ private $uri; - + /** * Final object URI * @@ -1956,7 +1956,7 @@ final class S3Request * @access private */ private $resource = ''; - + /** * Additional request parameters * @@ -1964,7 +1964,7 @@ final class S3Request * @access private */ private $parameters = array(); - + /** * Amazon specific request headers * @@ -2027,7 +2027,7 @@ final class S3Request */ function __construct($verb, $bucket = '', $uri = '', $endpoint = 's3.amazonaws.com') { - + $this->endpoint = $endpoint; $this->verb = $verb; $this->bucket = $bucket; @@ -2143,7 +2143,9 @@ public function getResponse() if (S3::$useSSL) { // Set protocol version - curl_setopt($curl, CURLOPT_SSLVERSION, S3::$useSSLVersion); + if (S3::$useSSLVersion !== null) { + curl_setopt($curl, CURLOPT_SSLVERSION, S3::$useSSLVersion); + } // SSL Validation can now be optional for those with broken OpenSSL installations curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, S3::$useSSLValidation ? 2 : 0);