Merge pull request #18653 from owncloud/dav-stream-guzzle

stream webdav downloads using http client

2 files changed, 14 insertions, 4 deletions

diff --git a/lib/private/http/client/client.php b/lib/private/http/client/client.php
index 323fc0d324f..b0aff10a413 100644
--- a/lib/private/http/client/client.php
+++ b/lib/private/http/client/client.php
@@ -120,7 +120,8 @@ class Client implements IClient {
 	 */
 	public function get($uri, array $options = []) {
 		$response = $this->client->get($uri, $options);
-		return new Response($response);
+		$isStream = isset($options['stream']) && $options['stream'];
+		return new Response($response, $isStream);
 	}
 
 	/**
diff --git a/lib/private/http/client/response.php b/lib/private/http/client/response.php
index 4e9df51d77f..558482491d1 100644
--- a/lib/private/http/client/response.php
+++ b/lib/private/http/client/response.php
@@ -34,17 +34,26 @@ class Response implements IResponse {
 	private $response;
 
 	/**
+	 * @var bool
+	 */
+	private $stream;
+
+	/**
 	 * @param GuzzleResponse $response
+	 * @param bool $stream
 	 */
-	public function __construct(GuzzleResponse $response) {
+	public function __construct(GuzzleResponse $response, $stream = false) {
 		$this->response = $response;
+		$this->stream = $stream;
 	}
 
 	/**
-	 * @return string
+	 * @return string|resource
 	 */
 	public function getBody() {
-		return $this->response->getBody()->getContents();
+		return $this->stream ?
+			$this->response->getBody()->detach():
+			$this->response->getBody()->getContents();
 	}
 
 	/**