Merge pull request #33378 from nextcloud/s3-no-null-bundle

don't set `null` as a bundle path
2022-07-27 15:43:08 +07:00 · 2022-07-27 15:43:08 +07:00 · d24823bda5
parent 3e9c52ae5f 61fdd91dcf
commit d24823bda5
1 changed files with 6 additions and 3 deletions
--- 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();