Skip to content

Commit

Permalink
Merge branch 'master' of github.com:m-knabe-reply/aus_driver_amazon_s…
Browse files Browse the repository at this point in the history
…3 into m-knabe-reply-master
  • Loading branch information
Lagerregal committed Oct 18, 2022
2 parents 09e102e + db96bc9 commit d878f09
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Classes/Driver/AmazonS3Driver.php
Original file line number Diff line number Diff line change
Expand Up @@ -1126,12 +1126,14 @@ protected function initializeClient()
$configuration = [
'version' => '2006-03-01',
'region' => $this->configuration['region'] ?? '',
'credentials' => [
'key' => $this->configuration['key'] ?? '',
'secret' => $this->configuration['secretKey'] ?? '',
],
'validation' => false,
];
if (!empty($this->configuration['key']) || !empty($this->configuration['secretKey'])) {
$configuration['credentials'] = [
'key' => $this->configuration['key'] ?? '',
'secret' => $this->configuration['secretKey'] ?? '',
];
}
if (!empty($GLOBALS['TYPO3_CONF_VARS']['HTTP']['proxy'])) {
$configuration['http']['proxy'] = $GLOBALS['TYPO3_CONF_VARS']['HTTP']['proxy'];
}
Expand Down

0 comments on commit d878f09

Please sign in to comment.