Skip to content

Commit

Permalink
Merge pull request #33378 from nextcloud/s3-no-null-bundle
Browse files Browse the repository at this point in the history
don't set `null` as a bundle path
  • Loading branch information
kesselb authored Jul 27, 2022
2 parents 3e9c52a + 61fdd91 commit d24823b
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions lib/private/Files/ObjectStore/S3ObjectTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,14 @@ public function readObject($urn) {
'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();
Expand Down

0 comments on commit d24823b

Please sign in to comment.