From: Florin Peter <github@florin-peter.de>
Date: Thu, 25 Apr 2013 18:23:54 +0000 (+0200)
Subject: webdav fix for file chunking
X-Git-Tag: v6.0.0alpha2~743^2~158
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=328dea93c7a4a68bfb83c15f97af64275c953782;p=nextcloud-server.git

webdav fix for file chunking
upload with big files should now work
@samtuke and @schiesbn we need a solution for the cache files created by webdav
---

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index c07b9a8a7aa..66ea282312e 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -337,7 +337,12 @@ class Proxy extends \OC_FileProxy {
         // Reformat path for use with OC_FSV
 		$path_split = explode( '/', $path );
 		$path_f = implode( '/', array_slice( $path_split, 3 ) );
-		
+
+        // FIXME: handling for /userId/cache used by webdav for chunking. The cache chunks are NOT encrypted
+        if($path_split[2] == 'cache') {
+            return $result;
+        }
+
 		// Disable encryption proxy to prevent recursive calls
         $proxyStatus = \OC_FileProxy::$enabled;
         \OC_FileProxy::$enabled = false;
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index f9198e0606a..2198963ce14 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -880,7 +880,7 @@ class Util {
 			
 		} else {
 		
-			throw new \Exception( 'Supplied path could not be resolved "' . $path . '"' );
+			return false;
 			
 		}