Merge pull request #9290 from nextcloud/streams-0.6.1

Use better way to determine stream type in stream wrapper
nextcloud · May 3, 2018 · 3f2a5c9 · 3f2a5c9
2 parents 2d66f04 + 57ba18f
commit 3f2a5c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/3rdparty b/3rdparty
diff --git 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);
+1 −0		.drone.yml
+1 −1		composer.json
+7 −7		composer.lock
+5 −0		composer/autoload_classmap.php
+5 −0		composer/autoload_static.php
+6 −6		composer/installed.json
+106 −0		icewind/streams/src/CountWrapper.php
+11 −3		icewind/streams/src/Wrapper.php