diff options
author | Vincent Petry <vincent@nextcloud.com> | 2022-06-09 13:01:59 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-09 13:01:59 +0300 |
commit | 7e819852ee436b4d3f4b10e46fcc46a8d1d25111 (patch) | |
tree | 9d524dfe78f29114d7767e77c84557669560f456 /lib | |
parent | 15649fc974b2059b2d41439d9f23267d9147ac3f (diff) | |
parent | 00e6eb2612f21420fbb999a3961b8cb10a1fce7b (diff) |
Merge pull request #32776 from nextcloud/backport/32767/stable24
[stable24] handle stream wrappers in SeekableHttpStream
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/Files/Stream/SeekableHttpStream.php | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/private/Files/Stream/SeekableHttpStream.php b/lib/private/Files/Stream/SeekableHttpStream.php index af797c7720d..820a681bd07 100644 --- a/lib/private/Files/Stream/SeekableHttpStream.php +++ b/lib/private/Files/Stream/SeekableHttpStream.php @@ -24,6 +24,7 @@ namespace OC\Files\Stream; use Icewind\Streams\File; +use Icewind\Streams\Wrapper; /** * A stream wrapper that uses http range requests to provide a seekable stream for http reading @@ -92,6 +93,18 @@ class SeekableHttpStream implements File { } $responseHead = stream_get_meta_data($this->current)['wrapper_data']; + + while ($responseHead instanceof Wrapper) { + $wrapperOptions = stream_context_get_options($responseHead->context); + foreach ($wrapperOptions as $options) { + if (isset($options['source']) && is_resource($options['source'])) { + $responseHead = stream_get_meta_data($options['source'])['wrapper_data']; + continue 2; + } + } + throw new \Exception("Failed to get source stream from stream wrapper of " . get_class($responseHead)); + } + $rangeHeaders = array_values(array_filter($responseHead, function ($v) { return preg_match('#^content-range:#i', $v) === 1; })); |