Skip to content

[stable22] Fix S3 ObjectStore proxy option #28683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 3 commits into from
Sep 23, 2021
Merged

[stable22] Fix S3 ObjectStore proxy option #28683

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c9e7e2
fix(proxy): reaching s3 storage behind some http proxy
faust64 Mar 13, 2021
956bccc
fix(proxy): reaching s3 storage behind some http proxy
maxbes Apr 8, 2021
d99a72b
fix(proxy): use accessor
maxbes Jun 28, 2021
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
Prev Previous commit
Next Next commit
fix(proxy): reaching s3 storage behind some http proxy 
Signed-off-by: Maxime Besson <[email protected]>
  • Loading branch information
@maxbes @backportbot
maxbes authored and backportbot[bot] committed Sep 1, 2021
commit 956bccc1c0de8549cfd33c83a70a358daad8b4dd
8 changes: 4 additions & 4 deletions lib/private/Files/ObjectStore/S3ObjectTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ abstract protected function getConnection();
*/
public function readObject($urn) {
return SeekableHttpStream::open(function ($range) use ($urn) {
$connection = $this->getConnection();
$command = $connection->getCommand('GetObject', [
$command = $this->getConnection()->getCommand('GetObject', [
'Bucket' => $this->bucket,
'Key' => $urn,
'Range' => 'bytes=' . $range,
Expand All @@ -70,8 +69,9 @@ public function readObject($urn) {
],
];

if ($connection->getProxy()) {
$opts['http']['proxy'] = $connection->getProxy();
if ($this->getProxy()) {
$opts['http']['proxy'] = $this->getProxy();
$opts['http']['request_fulluri'] = true;
}

$context = stream_context_create($opts);
Expand Down