From bf4a0385351f4eb8757a31b4253803211d6cdec7 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 24 Feb 2016 19:48:47 +0100 Subject: [PATCH] Add proxy support to external storage Otherwise debugging issues is a PITA --- lib/private/files/storage/dav.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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); } -- 2.39.5