diff options
author | Morris Jobke <hey@morrisjobke.de> | 2016-10-25 14:44:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-25 14:44:27 +0200 |
commit | 27ba46c40ed1d365965a1cb79ed7d8a38d759d2c (patch) | |
tree | e3ca5b0f5229fe50ff25665e955f23205cee0e53 | |
parent | 01a85a98f2acebe01b2af7bffb7e0a7dab7c121a (diff) | |
parent | 62bb991050b20b443f8f11cf04e0a331648d2519 (diff) | |
download | nextcloud-server-27ba46c40ed1d365965a1cb79ed7d8a38d759d2c.tar.gz nextcloud-server-27ba46c40ed1d365965a1cb79ed7d8a38d759d2c.zip |
Merge pull request #1890 from nextcloud/downstream-25428
fixing php 32 bit (arm) filemtime on large file issue (#18971) (#25428)
-rw-r--r-- | lib/private/Files/Storage/Local.php | 12 | ||||
-rw-r--r-- | lib/private/LargeFileHelper.php | 18 |
2 files changed, 28 insertions, 2 deletions
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php index bda7f2ea903..4fe7dcafbbf 100644 --- a/lib/private/Files/Storage/Local.php +++ b/lib/private/Files/Storage/Local.php @@ -173,8 +173,16 @@ class Local extends \OC\Files\Storage\Common { } public function filemtime($path) { - clearstatcache($this->getSourcePath($path)); - return $this->file_exists($path) ? filemtime($this->getSourcePath($path)) : false; + $fullPath = $this->getSourcePath($path); + clearstatcache($fullPath); + if (!$this->file_exists($path)) { + return false; + } + if (PHP_INT_SIZE === 4) { + $helper = new \OC\LargeFileHelper(); + return $helper->getFileMtime($fullPath); + } + return filemtime($fullPath); } public function touch($path, $mtime = null) { diff --git a/lib/private/LargeFileHelper.php b/lib/private/LargeFileHelper.php index 4363fb42cc6..9f18a6acd6b 100644 --- a/lib/private/LargeFileHelper.php +++ b/lib/private/LargeFileHelper.php @@ -1,6 +1,7 @@ <?php /** * @copyright Copyright (c) 2016, ownCloud, Inc. + * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch> * * @author Andreas Fischer <bantu@owncloud.com> * @author Lukas Reschke <lukas@statuscode.ch> @@ -177,6 +178,23 @@ class LargeFileHelper { return $result; } + /** + * Returns the current mtime for $fullPath + * + * @param string $fullPath + * @return int + */ + public function getFileMtime($fullPath) { + if (\OC_Helper::is_function_enabled('exec')) { + $os = strtolower(php_uname('s')); + if (strpos($os, 'linux') !== false) { + return $this->exec('stat -c %Y ' . escapeshellarg($fullPath)); + } + } + + return filemtime($fullPath); + } + protected function exec($cmd) { $result = trim(exec($cmd)); return ctype_digit($result) ? 0 + $result : null; |