summaryrefslogtreecommitdiffstats
path: root/owncloud-8.2.3-icewind-streams-encryption.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-04-16 17:04:51 +0200
committerRemi Collet <fedora@famillecollet.com>2016-04-16 17:04:51 +0200
commit434a1205344a71a0750c283fe9fac70f3ff82cfc (patch)
tree3ebb0fce321c8957336d92b4889bebb808b02448 /owncloud-8.2.3-icewind-streams-encryption.patch
parentbcfe6f7686289cccf41c2810ed8bf503131f7daa (diff)
owncloud: sync with Fedora
Diffstat (limited to 'owncloud-8.2.3-icewind-streams-encryption.patch')
-rw-r--r--owncloud-8.2.3-icewind-streams-encryption.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/owncloud-8.2.3-icewind-streams-encryption.patch b/owncloud-8.2.3-icewind-streams-encryption.patch
new file mode 100644
index 0000000..177aad2
--- /dev/null
+++ b/owncloud-8.2.3-icewind-streams-encryption.patch
@@ -0,0 +1,40 @@
+diff --git a/lib/private/files/stream/encryption.php b/lib/private/files/stream/encryption.php
+index e0d263d..4c32899 100644
+--- a/lib/private/files/stream/encryption.php
++++ b/lib/private/files/stream/encryption.php
+@@ -471,4 +471,13 @@ protected function parentStreamSeek($position) {
+ return parent::stream_seek($position);
+ }
+
++ /**
++ * @param string $path
++ * @param array $options
++ * @return bool
++ */
++ public function dir_opendir($path, $options) {
++ return false;
++ }
++
+ }
+diff --git a/lib/private/files/stream/encryption.php b/lib/private/files/stream/encryption.php
+index 4c32899..585a697 100644
+--- a/lib/private/files/stream/encryption.php
++++ b/lib/private/files/stream/encryption.php
+@@ -167,7 +167,7 @@ public static function wrap($source, $internalPath, $fullPath, array $header,
+ )
+ ));
+
+- return self::wrapSource($source, $mode, $context, 'ocencryption', $wrapper);
++ return self::wrapSource($source, $context, 'ocencryption', $wrapper, $mode);
+ }
+
+ /**
+@@ -181,7 +181,7 @@ public static function wrap($source, $internalPath, $fullPath, array $header,
+ * @return resource
+ * @throws \BadMethodCallException
+ */
+- protected static function wrapSource($source, $mode, $context, $protocol, $class) {
++ protected static function wrapSource($source, $context, $protocol, $class, $mode = 'r+') {
+ try {
+ stream_wrapper_register($protocol, $class);
+ if (@rewinddir($source) === false) {