From 547438527d5184f786117a21f65ca51b95ee695c Mon Sep 17 00:00:00 2001
From: Maxime Besson <maxime.besson@worteks.com>
Date: Thu, 8 Apr 2021 18:00:12 +0200
Subject: [PATCH] fix(proxy): reaching s3 storage behind some http proxy

Signed-off-by: Maxime Besson <maxime.besson@worteks.com>
---
 lib/private/Files/ObjectStore/S3ObjectTrait.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/private/Files/ObjectStore/S3ObjectTrait.php b/lib/private/Files/ObjectStore/S3ObjectTrait.php
index 3f9d86f8e2..9e23997d6d 100644
--- a/lib/private/Files/ObjectStore/S3ObjectTrait.php
+++ b/lib/private/Files/ObjectStore/S3ObjectTrait.php
@@ -51,8 +51,7 @@ trait S3ObjectTrait {
 	 */
 	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,
@@ -71,8 +70,9 @@ trait S3ObjectTrait {
 				],
 			];
 
-			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);