diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-05-12 12:00:56 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-05-12 12:00:56 +0200 |
| commit | 4613456a8ab2928954d7255b7e0df7387ab71c71 (patch) | |
| tree | 196c4fa9187990cb1b4b8dd0d20374e9a7febea5 /lib | |
| parent | b11c0c533e8d447e9193cd618bf11023e6216863 (diff) | |
| download | nextcloud-server-4613456a8ab2928954d7255b7e0df7387ab71c71.tar.gz nextcloud-server-4613456a8ab2928954d7255b7e0df7387ab71c71.zip | |
Check if cURL supports the desired features
Older versions of cURL that are unfortunately still bundled by distributors don't support these features which will result in errors and other possibly unpredictable behaviour.
Fixes https://github.com/owncloud/core/issues/16179 for master – stable8 requires another patch.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/files/storage/dav.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php index 3d9d48c7763..0ddfde15047 100644 --- a/lib/private/files/storage/dav.php +++ b/lib/private/files/storage/dav.php @@ -346,8 +346,12 @@ class DAV extends Common { curl_setopt($curl, CURLOPT_URL, $this->createBaseUri() . $this->encodePath($path)); curl_setopt($curl, CURLOPT_FILE, $fp); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); - curl_setopt($curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); - curl_setopt($curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); + if(defined('CURLOPT_PROTOCOLS')) { + curl_setopt($curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); + } + if(defined('CURLOPT_REDIR_PROTOCOLS')) { + curl_setopt($curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); + } if ($this->secure === true) { curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true); curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2); |