Skip to content

Commit e70ffdf

Browse files
authored
Merge pull request #33382 from nextcloud/backport/33378/stable24
[stable24] don't set `null` as a bundle path
2 parents 9070dbd + afdeae2 commit e70ffdf

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

lib/private/Files/ObjectStore/S3ObjectTrait.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,14 @@ public function readObject($urn) {
6969
'http' => [
7070
'protocol_version' => $request->getProtocolVersion(),
7171
'header' => $headers,
72-
],
73-
'ssl' => [
74-
'cafile' => $this->getCertificateBundlePath()
7572
]
7673
];
74+
$bundle = $this->getCertificateBundlePath();
75+
if ($bundle) {
76+
$opts['ssl'] = [
77+
'cafile' => $bundle
78+
];
79+
}
7780

7881
if ($this->getProxy()) {
7982
$opts['http']['proxy'] = $this->getProxy();

0 commit comments

Comments
 (0)