Merge pull request #32967 from nextcloud/backport/32816/stable20

[stable20] handle stream wrappers in SeekableHttpStream
pull/35681/head
blizzz 2 years ago committed by GitHub
commit 12f68d2028
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -25,6 +25,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
@ -93,6 +94,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;
}));

Loading…
Cancel
Save