cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into arindam-bug-priority

Browse Source
This commit is contained in:
Manish Verma
2016-11-04 18:23:31 +05:30
parent e4b9755294
commit 775e0561d8
2541 changed files with 59048 additions and 90348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vendor/aws/aws-sdk-php/src/S3/S3Client.php vendored
View File

@@ -176,8 +176,7 @@ class S3Client extends AwsClient implements S3ClientInterface
'doc' => 'Set to true to send requests to an S3 Dual Stack'
. ' endpoint by default, which enables IPv6 Protocol.'
. ' Can be enabled or disabled on individual operations by setting'
. ' \'@use_dual_stack_endpoint\' to true or false. Note:'
. ' you cannot use it together with an accelerate endpoint.',
. ' \'@use_dual_stack_endpoint\' to true or false.',
'default' => false,
],
];
@@ -219,17 +218,18 @@ class S3Client extends AwsClient implements S3ClientInterface
Middleware::contentType(['PutObject', 'UploadPart']),
's3.content_type'
);
$stack->appendBuild(
AccelerateMiddleware::wrap($this->getConfig('use_accelerate_endpoint')),
's3.use_accelerate_endpoint'
);
$stack->appendBuild(
DualStackMiddleware::wrap(
S3EndpointMiddleware::wrap(
$this->getRegion(),
$this->getConfig('use_dual_stack_endpoint')
[
'dual_stack' => $this->getConfig('use_dual_stack_endpoint'),
'accelerate' => $this->getConfig('use_accelerate_endpoint')
]
),
's3.use_dual_stack_endpoint'
's3.endpoint_middleware'
);
// Use the bucket style middleware when using a "bucket_endpoint" (for cnames)
if ($this->getConfig('bucket_endpoint')) {
$stack->appendBuild(BucketEndpointMiddleware::wrap(), 's3.bucket_endpoint');