diff options
author | Georg Ehrke <dev@georgswebsite.de> | 2012-07-11 12:47:30 +0400 |
---|---|---|
committer | Georg Ehrke <dev@georgswebsite.de> | 2012-07-11 12:47:30 +0400 |
commit | 55754939009a51da1ed8350d372d8d6f7e7768a5 (patch) | |
tree | 2f2d951d0d02aabfc7352f16a466fd61e0750635 /3rdparty | |
parent | f875240b47823d28c5169b354ffe1a3e80aaf57e (diff) | |
parent | 0f0aa1827f446ca531732bb1c807c244ef66676a (diff) |
Merge branch 'master' into calendar_import
Diffstat (limited to '3rdparty')
-rw-r--r-- | 3rdparty/Sabre/DAV/Client.php | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/3rdparty/Sabre/DAV/Client.php b/3rdparty/Sabre/DAV/Client.php index d257c86da10..075e84caa1d 100644 --- a/3rdparty/Sabre/DAV/Client.php +++ b/3rdparty/Sabre/DAV/Client.php @@ -22,7 +22,6 @@ class Sabre_DAV_Client { protected $userName; protected $password; protected $proxy; - protected $capath; /** * Constructor @@ -50,10 +49,6 @@ class Sabre_DAV_Client { 'proxy' ); - $this->capath = ''; - if (isset($settings['capath'])) { - $this->capath = $settings['capath']; - } foreach($validSettings as $validSetting) { if (isset($settings[$validSetting])) { @@ -259,8 +254,6 @@ class Sabre_DAV_Client { //CURLOPT_SSL_VERIFYPEER => false, ); - if ($this->capath != '') $curlSettings[CURLOPT_CAPATH] = $this->capath; - switch ($method) { case 'PUT': $curlSettings[CURLOPT_PUT] = true; |