Skip to content
Merged
Changes from 1 commit
Commits
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
2 changes: 2 additions & 0 deletions lib/private/Files/ObjectStore/S3ConnectionTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* @author Roeland Jago Douma <[email protected]>
* @author S. Cat <[email protected]>
* @author Stephen Cuppett <[email protected]>
* @author Jasper Weyne <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
Expand Down Expand Up @@ -140,6 +141,7 @@ public function getConnection() {
'csm' => false,
'use_arn_region' => false,
'http' => ['verify' => $certPath],
'use_aws_shared_config_files' => false,
];
if ($this->getProxy()) {
$options['http']['proxy'] = $this->getProxy();
Expand Down