summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2012-07-02 17:52:51 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2012-07-02 17:52:51 +0200
commitab036d47645867374cb6f4f2d168f407e96ceda5 (patch)
tree1c073a4e843a9217aa2d23c7f35e54e5a974e763
parent515adceaceea8de6e3264f17b2fe24419da10959 (diff)
downloadnextcloud-server-ab036d47645867374cb6f4f2d168f407e96ceda5.tar.gz
nextcloud-server-ab036d47645867374cb6f4f2d168f407e96ceda5.zip
webdav client crashes for secure connections if he doesn't have the right root certificate for ssl verification. For the moment I print at least a useful error message to the OC log and the Apache log
-rw-r--r--3rdparty/Sabre/DAV/Client.php1
-rw-r--r--apps/files_external/lib/webdav.php2
2 files changed, 3 insertions, 0 deletions
diff --git a/3rdparty/Sabre/DAV/Client.php b/3rdparty/Sabre/DAV/Client.php
index a8320dd9782..23bd7c05394 100644
--- a/3rdparty/Sabre/DAV/Client.php
+++ b/3rdparty/Sabre/DAV/Client.php
@@ -249,6 +249,7 @@ class Sabre_DAV_Client {
// Automatically follow redirects
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_MAXREDIRS => 5,
+ //CURLOPT_SSL_VERIFYPEER => false,
);
switch ($method) {
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index d0fe2aca854..dda8afe9f2a 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -96,6 +96,8 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
$responseType=$response["{DAV:}resourcetype"]->resourceType;
return (count($responseType)>0 and $responseType[0]=="{DAV:}collection")?'dir':'file';
}catch(Exception $e){
+ error_log($e->getMessage());
+ \OCP\Util::writeLog("webdav client", \OCP\Util::sanitizeHTML($e->getMessage()), \OCP\Util::ERROR);
return false;
}
}