diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-25 14:36:00 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-25 14:36:00 +0100 |
| commit | 914ac09aaec9e4f8c5e0ed10ca881cc85cef4b28 (patch) | |
| tree | de16ef66b04b3a6525eb334db311a97ff015f63c /lib | |
| parent | 202bf17e4acff00d48ffd94ed95d83e53f3dec90 (diff) | |
| parent | db2ddb54413831adef41fe5e233481a2d546731d (diff) | |
| download | nextcloud-server-914ac09aaec9e4f8c5e0ed10ca881cc85cef4b28.tar.gz nextcloud-server-914ac09aaec9e4f8c5e0ed10ca881cc85cef4b28.zip | |
Merge pull request #22636 from owncloud/fix-ssl-on-external-storages
Fix HTTPS support on external storages
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/files/storage/dav.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php index a6e77e1b232..5e00a03ebb8 100644 --- a/lib/private/files/storage/dav.php +++ b/lib/private/files/storage/dav.php @@ -136,9 +136,13 @@ class DAV extends Common { 'password' => $this->password, ); + $proxy = \OC::$server->getConfig()->getSystemValue('proxy', ''); + if($proxy !== '') { + $settings['proxy'] = $proxy; + } + $this->client = new Client($settings); $this->client->setThrowExceptions(true); - if ($this->secure === true && $this->certPath) { $this->client->addCurlSetting(CURLOPT_CAINFO, $this->certPath); } |