diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-02-24 19:48:47 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-02-24 19:48:47 +0100 |
| commit | bf4a0385351f4eb8757a31b4253803211d6cdec7 (patch) | |
| tree | f1b67e6c9d0586064192da2a9c68ac030586795f | |
| parent | faf65e73b778867d36f0e13dd1b0f1a4ef1f4723 (diff) | |
| download | nextcloud-server-bf4a0385351f4eb8757a31b4253803211d6cdec7.tar.gz nextcloud-server-bf4a0385351f4eb8757a31b4253803211d6cdec7.zip | |
Add proxy support to external storage
Otherwise debugging issues is a PITA
| -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); } |