summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-05-29 17:08:12 +0200
committerGitHub <noreply@github.com>2018-05-29 17:08:12 +0200
commitb3e9e36b14b3ee4785c4d2e0a4964ff771e6c599 (patch)
tree5ce561435d7a77a44e123fabfe679ddef099f3db
parentde539c6e272e4c16db0fd8fdfb904bd1f8c8d2c1 (diff)
parent184a0b97fc80bd3767b4197a13692b855ddcd375 (diff)
downloadnextcloud-server-b3e9e36b14b3ee4785c4d2e0a4964ff771e6c599.tar.gz
nextcloud-server-b3e9e36b14b3ee4785c4d2e0a4964ff771e6c599.zip
Merge pull request #9656 from nextcloud/backport/9490/stable13
[stable13] Make LargeFileHelper.php faster by avoiding execs as much as possible
-rwxr-xr-x[-rw-r--r--]lib/private/LargeFileHelper.php20
1 files changed, 14 insertions, 6 deletions
diff --git a/lib/private/LargeFileHelper.php b/lib/private/LargeFileHelper.php
index 9f18a6acd6b..e64547124e9 100644..100755
--- a/lib/private/LargeFileHelper.php
+++ b/lib/private/LargeFileHelper.php
@@ -117,7 +117,7 @@ class LargeFileHelper {
public function getFileSizeViaCurl($fileName) {
if (\OC::$server->getIniWrapper()->getString('open_basedir') === '') {
$encodedFileName = rawurlencode($fileName);
- $ch = curl_init("file://$encodedFileName");
+ $ch = curl_init("file:///$encodedFileName");
curl_setopt($ch, CURLOPT_NOBODY, true);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_HEADER, true);
@@ -185,14 +185,22 @@ class LargeFileHelper {
* @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));
+ try {
+ $result = filemtime($fullPath);
+ } catch (\Exception $e) {
+ $result =- 1;
+ }
+ if ($result < 0) {
+ 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 $result;
+
- return filemtime($fullPath);
}
protected function exec($cmd) {