diff options
author | Chocobozzz <me@florianbigard.com> | 2022-12-19 16:10:38 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-12-19 16:10:38 +0100 |
commit | 93293ca7887e34fd9b6413fdaeea3d1dddc46ece (patch) | |
tree | 63272268dde4bfd1dcc9ff46b46d758d25c0b88f /server/lib | |
parent | c6820dc4a58919d381c3bc0bad131ba1d3b10443 (diff) | |
parent | 57e11a20f12c69927e5739ecf541ed340934ff90 (diff) | |
download | PeerTube-93293ca7887e34fd9b6413fdaeea3d1dddc46ece.tar.gz PeerTube-93293ca7887e34fd9b6413fdaeea3d1dddc46ece.tar.zst PeerTube-93293ca7887e34fd9b6413fdaeea3d1dddc46ece.zip |
Merge branch 'release/5.0.0' into develop
Diffstat (limited to 'server/lib')
-rw-r--r-- | server/lib/object-storage/shared/object-storage-helpers.ts | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/server/lib/object-storage/shared/object-storage-helpers.ts b/server/lib/object-storage/shared/object-storage-helpers.ts index 3046d76bc..8dff08ab4 100644 --- a/server/lib/object-storage/shared/object-storage-helpers.ts +++ b/server/lib/object-storage/shared/object-storage-helpers.ts | |||
@@ -187,7 +187,10 @@ async function createObjectReadStream (options: { | |||
187 | 187 | ||
188 | const response = await getClient().send(command) | 188 | const response = await getClient().send(command) |
189 | 189 | ||
190 | return response.Body as Readable | 190 | return { |
191 | response, | ||
192 | stream: response.Body as Readable | ||
193 | } | ||
191 | } | 194 | } |
192 | 195 | ||
193 | // --------------------------------------------------------------------------- | 196 | // --------------------------------------------------------------------------- |