aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorszaimen <szaimen@e.mail.de>2022-11-01 14:03:48 +0100
committerszaimen <szaimen@e.mail.de>2022-11-02 11:13:34 +0100
commitdd8774389e21b59c07882580356d51de018fe867 (patch)
tree8abfe35c70004ca0d6e4df70098cf63cb087e6ec /lib
parent075a87670d4157086974d84972553914078c203b (diff)
downloadnextcloud-server-dd8774389e21b59c07882580356d51de018fe867.tar.gz
nextcloud-server-dd8774389e21b59c07882580356d51de018fe867.zip
remove 32-bit workarounds
Signed-off-by: szaimen <szaimen@e.mail.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Files/Storage/Local.php13
-rw-r--r--lib/private/Setup.php7
-rw-r--r--lib/private/Streamer.php2
-rw-r--r--lib/private/legacy/OC_Response.php13
4 files changed, 4 insertions, 31 deletions
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
index ff157bfe7f6..0c5375c0240 100644
--- a/lib/private/Files/Storage/Local.php
+++ b/lib/private/Files/Storage/Local.php
@@ -170,11 +170,6 @@ class Local extends \OC\Files\Storage\Common {
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 @@ class Local extends \OC\Files\Storage\Common {
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 @@ class Local extends \OC\Files\Storage\Common {
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
index 3b79b31b849..7b08fb2f66f 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -247,14 +247,13 @@ class Setup {
];
}
- 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
index 88204be9805..db7d0024b5a 100644
--- a/lib/private/Streamer.php
+++ b/lib/private/Streamer.php
@@ -86,7 +86,7 @@ class Streamer {
} 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
index e4525fe9e10..b849710e90b 100644
--- a/lib/private/legacy/OC_Response.php
+++ b/lib/private/legacy/OC_Response.php
@@ -52,19 +52,6 @@ class OC_Response {
* @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);
}