Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Schwan <carl@carlschwan.eu>2022-09-19 11:19:15 +0300
committerGitHub <noreply@github.com>2022-09-19 11:19:15 +0300
commit3950deb42fa9c7c5805e5047d07c988d59e57eb9 (patch)
treee98772dc9259d27e6142b6bd487de8faafe82966
parentc3a87e8c4880c7a248c539b771759076d1f22f1c (diff)
parent44f6c931e7c9c74ea4f448d3cdfbaa89f3b7c379 (diff)
Merge pull request #32740 from jasperweyne/patch-2
Fix open_basedir issues by AWS SDK
-rw-r--r--lib/private/Files/ObjectStore/S3ConnectionTrait.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
index 8286321450d..bdda1f8bee8 100644
--- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php
+++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -11,6 +11,7 @@
* @author Roeland Jago Douma <roeland@famdouma.nl>
* @author S. Cat <33800996+sparrowjack63@users.noreply.github.com>
* @author Stephen Cuppett <steve@cuppett.com>
+ * @author Jasper Weyne <jasperweyne@gmail.com>
*
* @license GNU AGPL version 3 or any later version
*
@@ -132,6 +133,7 @@ trait S3ConnectionTrait {
'csm' => false,
'use_arn_region' => false,
'http' => ['verify' => $this->getCertificateBundlePath()],
+ 'use_aws_shared_config_files' => false,
];
if ($this->getProxy()) {
$options['http']['proxy'] = $this->getProxy();