Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon L <szaimen@e.mail.de>2022-10-23 17:53:52 +0300
committerGitHub <noreply@github.com>2022-10-23 17:53:52 +0300
commite3527fdb50c288f8def7c54952ed105163814ce2 (patch)
tree7eaa5cca0d798876f033c97ac04000ee08a42536
parent8f26fc5711833b6fff55b996be34dc9b91484c2c (diff)
parent53787e2d3be0c81a9600a905c69ff2585fa3c3ef (diff)
Merge pull request #34751 from nextcloud/backport/33087/stable23
[stable23] fix external storages access
-rw-r--r--lib/private/Http/Client/ClientService.php4
-rw-r--r--tests/lib/Http/Client/ClientServiceTest.php4
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/private/Http/Client/ClientService.php b/lib/private/Http/Client/ClientService.php
index d1aed2d7883..fd69536ab99 100644
--- a/lib/private/Http/Client/ClientService.php
+++ b/lib/private/Http/Client/ClientService.php
@@ -28,7 +28,6 @@ namespace OC\Http\Client;
use GuzzleHttp\Client as GuzzleClient;
use GuzzleHttp\HandlerStack;
-use GuzzleHttp\Handler\CurlHandler;
use OCP\Http\Client\IClient;
use OCP\Http\Client\IClientService;
use OCP\ICertificateManager;
@@ -68,8 +67,7 @@ class ClientService implements IClientService {
* @return Client
*/
public function newClient(): IClient {
- $handler = new CurlHandler();
- $stack = HandlerStack::create($handler);
+ $stack = HandlerStack::create();
$stack->push($this->dnsPinMiddleware->addDnsPinning());
$client = new GuzzleClient(['handler' => $stack]);
diff --git a/tests/lib/Http/Client/ClientServiceTest.php b/tests/lib/Http/Client/ClientServiceTest.php
index f529e25966e..e2b395aaddd 100644
--- a/tests/lib/Http/Client/ClientServiceTest.php
+++ b/tests/lib/Http/Client/ClientServiceTest.php
@@ -10,7 +10,6 @@ namespace Test\Http\Client;
use GuzzleHttp\Client as GuzzleClient;
use GuzzleHttp\HandlerStack;
-use GuzzleHttp\Handler\CurlHandler;
use OC\Http\Client\Client;
use OC\Http\Client\ClientService;
use OC\Http\Client\DnsPinMiddleware;
@@ -45,8 +44,7 @@ class ClientServiceTest extends \Test\TestCase {
$localAddressChecker
);
- $handler = new CurlHandler();
- $stack = HandlerStack::create($handler);
+ $stack = HandlerStack::create();
$stack->push($dnsPinMiddleware->addDnsPinning());
$guzzleClient = new GuzzleClient(['handler' => $stack]);