Do not encode path separator

owncloud · Oct 23, 2019 · e6a5c9f · e6a5c9f
1 parent 822f3e6
commit e6a5c9f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/changelog/unreleased/36319 b/changelog/unreleased/36319
@@ -0,0 +1,5 @@
+Bugfix: LargeFileHelper::getFileSizeViaCurl is broken with newer libcurl
+
+getFileSizeViaCurl is a workaround for 32 bit platforms. Path separator was encoded when encoding the path but newer libcurl doesn't support that.
+
+https://github.com/owncloud/core/pull/36319
diff --git a/lib/private/LargeFileHelper.php b/lib/private/LargeFileHelper.php
@@ -114,7 +114,9 @@ public function getFileSize($filename) {
 	*/
 	public function getFileSizeViaCurl($fileName) {
 		if (\OC::$server->getIniWrapper()->getString('open_basedir') === '') {
-			$encodedFileName = \rawurlencode($fileName);
+			$pathParts = \explode('/', $fileName);
+			$encodedPathParts = \array_map('rawurlencode', $pathParts);
+			$encodedFileName = \implode('/', $encodedPathParts);
 			$ch = \curl_init("file://$encodedFileName");
 			\curl_setopt($ch, CURLOPT_NOBODY, true);
 			\curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);