remove 32-bit workarounds

Signed-off-by: szaimen <[email protected]>
nextcloud · Nov 2, 2022 · dd87743 · dd87743
1 parent 075a876
commit dd87743
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 31 deletions.
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
@@ -170,11 +170,6 @@ public function stat($path) {
 			return false;
 		}
 		$statResult = @stat($fullPath);
-		if (PHP_INT_SIZE === 4 && $statResult && !$this->is_dir($path)) {
-			$filesize = $this->filesize($path);
-			$statResult['size'] = $filesize;
-			$statResult[7] = $filesize;
-		}
 		if (is_array($statResult)) {
 			$statResult['full_path'] = $fullPath;
 		}
@@ -246,10 +241,6 @@ public function filesize($path) {
 			return 0;
 		}
 		$fullPath = $this->getSourcePath($path);
-		if (PHP_INT_SIZE === 4) {
-			$helper = new \OC\LargeFileHelper;
-			return $helper->getFileSize($fullPath);
-		}
 		return filesize($fullPath);
 	}
 
@@ -271,10 +262,6 @@ public function filemtime($path) {
 		if (!$this->file_exists($path)) {
 			return false;
 		}
-		if (PHP_INT_SIZE === 4) {
-			$helper = new \OC\LargeFileHelper();
-			return $helper->getFileMtime($fullPath);
-		}
 		return filemtime($fullPath);
 	}
 

diff --git a/lib/private/Setup.php b/lib/private/Setup.php
@@ -247,14 +247,13 @@ public function getSystemInfo($allowAllDatabases = false) {
 			];
 		}
 
-		if ($this->iniWrapper->getString('open_basedir') !== '' && PHP_INT_SIZE === 4) {
+		if (PHP_INT_SIZE < 8) {
 			$errors[] = [
 				'error' => $this->l10n->t(
-					'It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. ' .
-					'This will lead to problems with files over 4 GB and is highly discouraged.',
+					'It seems that this %s instance is running on a 32-bit PHP environment. 64-bit is required for 26 and higher.',
 					[$this->defaults->getProductName()]
 				),
-				'hint' => $this->l10n->t('Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP.'),
+				'hint' => $this->l10n->t('Please switch to 64-bit PHP.'),
 			];
 		}
 

diff --git a/lib/private/Streamer.php b/lib/private/Streamer.php
@@ -86,7 +86,7 @@ public function __construct(IRequest $request, int $size, int $numberOfFiles) {
 		} elseif ($request->isUserAgent($this->preferTarFor)) {
 			$this->streamerInstance = new TarStreamer();
 		} else {
-			$this->streamerInstance = new ZipStreamer(['zip64' => PHP_INT_SIZE !== 4]);
+			$this->streamerInstance = new ZipStreamer(['zip64' => true]);
 		}
 	}
 

diff --git a/lib/private/legacy/OC_Response.php b/lib/private/legacy/OC_Response.php
@@ -52,19 +52,6 @@ public static function setContentDispositionHeader($filename, $type = 'attachmen
 	 * @param string|int|float $length Length to be sent
 	 */
 	public static function setContentLengthHeader($length) {
-		if (PHP_INT_SIZE === 4) {
-			if ($length > PHP_INT_MAX && stripos(PHP_SAPI, 'apache') === 0) {
-				// Apache PHP SAPI casts Content-Length headers to PHP integers.
-				// This enforces a limit of PHP_INT_MAX (2147483647 on 32-bit
-				// platforms). So, if the length is greater than PHP_INT_MAX,
-				// we just do not send a Content-Length header to prevent
-				// bodies from being received incompletely.
-				return;
-			}
-			// Convert signed integer or float to unsigned base-10 string.
-			$lfh = new \OC\LargeFileHelper;
-			$length = $lfh->formatUnsignedInteger($length);
-		}
 		header('Content-Length: '.$length);
 	}