diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2022-08-01 21:37:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-01 21:37:57 +0300 |
| commit | bb94d2c1910ee1104069b99bad8eda5b331b0733 (patch) | |
| tree | cd0e5bc3bcdda3a3399c7df88138d787170bd66f | |
| parent | 8ac46a6645d539fd36300fb04fd7d2c12d41f425 (diff) | |
| parent | db86e92d050ec2797e2aa04cb6c788318eafee5f (diff) | |
Merge pull request #33383 from nextcloud/backport/33378/stable23
[stable23] don't set `null` as a bundle path
| -rw-r--r-- | lib/private/Files/ObjectStore/S3ObjectTrait.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/private/Files/ObjectStore/S3ObjectTrait.php b/lib/private/Files/ObjectStore/S3ObjectTrait.php index a92c5c139ea..0458079b66c 100644 --- a/lib/private/Files/ObjectStore/S3ObjectTrait.php +++ b/lib/private/Files/ObjectStore/S3ObjectTrait.php @@ -69,11 +69,14 @@ trait S3ObjectTrait { 'http' => [ 'protocol_version' => $request->getProtocolVersion(), 'header' => $headers, - ], - 'ssl' => [ - 'cafile' => $this->getCertificateBundlePath() ] ]; + $bundle = $this->getCertificateBundlePath(); + if ($bundle) { + $opts['ssl'] = [ + 'cafile' => $bundle + ]; + } if ($this->getProxy()) { $opts['http']['proxy'] = $this->getProxy(); |