From: Frederic Massart <fred@moodle.com>
Date: Fri, 19 Jul 2013 08:02:56 +0000 (+0800)
Subject: MDL-40615 Repository: Updated Amazon S3 library
X-Git-Tag: v2.3.9~14
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=c5cb333a383b670852dad7ab7d334438d10e2d43

MDL-40615 Repository: Updated Amazon S3 library

Fixed insecure use of CURLOPT_SSL_VERIFYHOST
---

diff --git a/repository/s3/README_MOODLE.txt b/repository/s3/README_MOODLE.txt
index a6c5f9281f1..7d7904145b5 100644
--- a/repository/s3/README_MOODLE.txt
+++ b/repository/s3/README_MOODLE.txt
@@ -3,8 +3,7 @@
 Amazon S3 PHP Class
 
 Cloned from git://github.com/tpyo/amazon-s3-php-class.git
-Branch master
-On July 23rd 2012
+At commit 56770370c33a5310c5e07a9d22aef8c162f150ee
 
 https://github.com/tpyo/amazon-s3-php-class
 http://undesigned.org.za/2007/10/22/amazon-s3-php-class
diff --git a/repository/s3/S3.php b/repository/s3/S3.php
index 247d6c382e9..4bd511141a6 100644
--- a/repository/s3/S3.php
+++ b/repository/s3/S3.php
@@ -1809,7 +1809,7 @@ final class S3Request
 		if (S3::$useSSL)
 		{
 			// SSL Validation can now be optional for those with broken OpenSSL installations
-			curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, S3::$useSSLValidation ? 1 : 0);
+			curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, S3::$useSSLValidation ? 2 : 0);
 			curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, S3::$useSSLValidation ? 1 : 0);
 
 			if (S3::$sslKey !== null) curl_setopt($curl, CURLOPT_SSLKEY, S3::$sslKey);