Browse Source
Merge pull request #45854 from nextcloud/chore-update-aws-sdk
chore(deps): Bump aws/aws-sdk-php from 3.240.8 to 3.311.2
pull/45833/head
Andy Scherzinger
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
4 additions and
4 deletions
-
3rdparty
-
lib/private/Files/ObjectStore/S3ConnectionTrait.php
-
lib/private/Files/ObjectStore/S3Signature.php
|
|
|
@ -1 +1 @@ |
|
|
|
Subproject commit 070e933ab4385021a7fc5259000f303507bedbbe |
|
|
|
Subproject commit 45d8fc9e09fbb4d3c4de5819afd9a6f72ce00f56 |
|
|
|
@ -11,7 +11,7 @@ use Aws\Credentials\Credentials; |
|
|
|
use Aws\Exception\CredentialsException; |
|
|
|
use Aws\S3\Exception\S3Exception; |
|
|
|
use Aws\S3\S3Client; |
|
|
|
use GuzzleHttp\Promise; |
|
|
|
use GuzzleHttp\Promise\Create; |
|
|
|
use GuzzleHttp\Promise\RejectedPromise; |
|
|
|
use OCP\ICertificateManager; |
|
|
|
use Psr\Log\LoggerInterface; |
|
|
|
@ -178,7 +178,7 @@ trait S3ConnectionTrait { |
|
|
|
$secret = empty($this->params['secret']) ? null : $this->params['secret']; |
|
|
|
|
|
|
|
if ($key && $secret) { |
|
|
|
return Promise\promise_for( |
|
|
|
return Create::promiseFor( |
|
|
|
new Credentials($key, $secret) |
|
|
|
); |
|
|
|
} |
|
|
|
|
|
|
|
@ -93,7 +93,7 @@ class S3Signature implements SignatureInterface { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
$queryString = http_build_query($query, null, '&', PHP_QUERY_RFC3986); |
|
|
|
$queryString = http_build_query($query, '', '&', PHP_QUERY_RFC3986); |
|
|
|
|
|
|
|
return $request->withUri($request->getUri()->withQuery($queryString)); |
|
|
|
} |
|
|
|
|