diff options
| author | Robin Appelman <robin@icewind.nl> | 2022-07-27 13:58:07 +0300 |
|---|---|---|
| committer | backportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com> | 2022-07-27 16:46:34 +0300 |
| commit | afdeae2cc21f5a9caf1c3242a96cfceb14553f69 (patch) | |
| tree | bb9182026f763a864034648965937dc64c901930 | |
| parent | 6a3cd32a2dc1e5451ca762e171b62493be11dbca (diff) | |
don't set `null` as a bundle pathbackport/33378/stable24
Signed-off-by: Robin Appelman <robin@icewind.nl>
| -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(); |