Skip to content

[stable22] don't set null as a bundle path #33384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
backportbot-nextcloud wants to merge 1 commit into from
Closed

[stable22] don't set null as a bundle path #33384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
don't set null as a bundle path 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @backportbot-nextcloud
icewind1991 authored and backportbot-nextcloud[bot] committed Jul 27, 2022
commit 984bbc3a0fdd95bdb4d7c1a5ade95e0a899b34da
6 changes: 6 additions & 0 deletions lib/private/Files/ObjectStore/S3ObjectTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ public function readObject($urn) {
'header' => $headers,
],
];
$bundle = $this->getCertificateBundlePath();

Check failure

Code scanning / Psalm

UndefinedMethod

Method OCA\Files_External\Lib\Storage\AmazonS3::getCertificateBundlePath does not exist
if ($bundle) {
$opts['ssl'] = [
'cafile' => $bundle
];
}

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