Refactor getFileSizeViaCurl

phil-davis · phil-davis · commit a63b3cef2071 · 2022-05-16T13:58:39.000+05:45
diff --git a/lib/private/LargeFileHelper.php b/lib/private/LargeFileHelper.php
@@ -113,7 +113,6 @@ public function getFileSize($filename) {
 	*                        null on failure.
 	*/
 	public function getFileSizeViaCurl($fileName) {
-		global $fileSizeFromContentLength;
 		if (\OC::$server->getIniWrapper()->getString('open_basedir') === '') {
 			$pathParts = \explode('/', $fileName);
 			$encodedPathParts = \array_map('rawurlencode', $pathParts);
@@ -131,7 +130,14 @@ public function getFileSizeViaCurl($fileName) {
 			// that curl_exec processes internally. That is working, and so we use that as
 			// an alternative way to access Content-Length.
 			\curl_setopt($ch, CURLOPT_HEADER, true);
-			\curl_setopt($ch, CURLOPT_HEADERFUNCTION, ['OC\LargeFileHelper', 'curlHeaderCallback']);
+			$fileSizeFromContentLength = -1;
+			\curl_setopt($ch, CURLOPT_HEADERFUNCTION, function($ch, $header_line) use (&$fileSizeFromContentLength) {
+				\preg_match('/Content-Length: (\d+)/', $header_line, $matches);
+				if (isset($matches[1])) {
+					$fileSizeFromContentLength = 0 + $matches[1];
+				}
+				return \strlen($header_line);
+			});
 			$data = \curl_exec($ch);
 			\curl_close($ch);
 			if ($data !== false) {
@@ -140,23 +146,17 @@ public function getFileSizeViaCurl($fileName) {
 				if (isset($matches[1])) {
 					return 0 + $matches[1];
 				}
-				if (isset($fileSizeFromContentLength)) {
+				// If the CURLOPT_HEADERFUNCTION detected a Content-Length
+				// then it should have set $fileSizeFromContentLength to
+				// something greater than or equal to zero. If so, return it.
+				if ($fileSizeFromContentLength >= 0) {
 					return $fileSizeFromContentLength;
 				}
 			}
 		}
 		return null;
 	}
 
-	public static function curlHeaderCallback($ch, $header_line) {
-		global $fileSizeFromContentLength;
-		\preg_match('/Content-Length: (\d+)/', $header_line, $matches);
-		if (isset($matches[1])) {
-			$fileSizeFromContentLength = 0 + $matches[1];
-		}
-		return \strlen($header_line);
-	}
-
 	/**
 	* @brief Tries to get the size of a file via an exec() call.
 	*
