From c27016b1d15f85d1860b45d5bf9564316d9cf23a Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 24 Apr 2018 11:26:45 +0200 Subject: [PATCH 1/2] update icewind/streams to 0.6.1 Signed-off-by: Robin Appelman --- 3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty b/3rdparty index d4e8f89af1df2..d0794726e2c37 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit d4e8f89af1df2e0b690ce8cae72b63e864472558 +Subproject commit d0794726e2c370c80fbcd29d29b2291fdf9e15f8 From 57ba18f47f18886f3ea31df5eca399e83609e4b6 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 24 Apr 2018 11:34:08 +0200 Subject: [PATCH 2/2] Use better way to determine stream type in encryption stream wrapper Signed-off-by: Robin Appelman --- lib/private/Files/Stream/Encryption.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/private/Files/Stream/Encryption.php b/lib/private/Files/Stream/Encryption.php index 05be5a5b286e0..65d379c028920 100644 --- a/lib/private/Files/Stream/Encryption.php +++ b/lib/private/Files/Stream/Encryption.php @@ -195,10 +195,10 @@ public static function wrap($source, $internalPath, $fullPath, array $header, protected static function wrapSource($source, $context, $protocol, $class, $mode = 'r+') { try { stream_wrapper_register($protocol, $class); - if (@rewinddir($source) === false) { - $wrapped = fopen($protocol . '://', $mode, false, $context); - } else { + if (self::isDirectoryHandle($source)) { $wrapped = opendir($protocol . '://', $context); + } else { + $wrapped = fopen($protocol . '://', $mode, false, $context); } } catch (\BadMethodCallException $e) { stream_wrapper_unregister($protocol);