Merge branch 'master' into calendar_import

1 files changed, 9 insertions, 0 deletions

diff --git a/3rdparty/Sabre/DAV/Client.php b/3rdparty/Sabre/DAV/Client.php
index 23bd7c05394..d257c86da10 100644
--- a/3rdparty/Sabre/DAV/Client.php
+++ b/3rdparty/Sabre/DAV/Client.php
@@ -22,6 +22,7 @@ class Sabre_DAV_Client {
     protected $userName;
     protected $password;
     protected $proxy;
+    protected $capath;
 
     /**
      * Constructor
@@ -49,6 +50,11 @@ class Sabre_DAV_Client {
             'proxy'
         );
 
+        $this->capath = '';
+        if (isset($settings['capath'])) {
+        	$this->capath = $settings['capath'];
+        }
+
         foreach($validSettings as $validSetting) {
             if (isset($settings[$validSetting])) {
                 $this->$validSetting = $settings[$validSetting];
@@ -249,9 +255,12 @@ class Sabre_DAV_Client {
             // Automatically follow redirects
             CURLOPT_FOLLOWLOCATION => true,
             CURLOPT_MAXREDIRS => 5,
+        	CURLOPT_SSL_VERIFYPEER => true,
         	//CURLOPT_SSL_VERIFYPEER	=> false,
         );
 
+        if ($this->capath != '') $curlSettings[CURLOPT_CAPATH] = $this->capath;
+        
         switch ($method) {
             case 'PUT':
                 $curlSettings[CURLOPT_PUT] = true;