diff options
| author | Daniel <mail@danielkesselberg.de> | 2022-07-27 15:43:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-27 15:43:08 +0200 |
| commit | d24823bda5c2fff264fb7d27f1cd2a8383515bcc (patch) | |
| tree | 4b36cbe787ac6189a136503880e73a9bbf3a62b4 /lib | |
| parent | 3e9c52ae5f640e40f26beec76c26272cf7fb1387 (diff) | |
| parent | 61fdd91dcf6a17f97f2a416caee2ba39982f3b08 (diff) | |
| download | nextcloud-server-d24823bda5c2fff264fb7d27f1cd2a8383515bcc.tar.gz nextcloud-server-d24823bda5c2fff264fb7d27f1cd2a8383515bcc.zip | |
Merge pull request #33378 from nextcloud/s3-no-null-bundle
don't set `null` as a bundle path
Diffstat (limited to 'lib')
| -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 0b2fd95c652..9d692e01a23 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(); |