From: Richard Clarkson Date: Thu, 27 Nov 2014 19:26:45 +0000 (+0100) Subject: Limit blacklist to php files X-Git-Tag: v8.0.0alpha1~216^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0d98329cacc52b34d31d77eda6a0cf85fb4e534e;p=nextcloud-server.git Limit blacklist to php files During performance optimization I have discovered that the installer scans all files for the blacklisted words. This greatly impacts speed on lower end devices such as the raspberry pie. This commit limits it to PHP files which seems to achieve the desired effect. I have used the --include option to achieve this, see http://stackoverflow.com/questions/1987926/how-do-i-grep-recursively This contribution is MIT licensed --- diff --git a/lib/private/installer.php b/lib/private/installer.php index f43969691c7..60ed06ae352 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -568,7 +568,7 @@ class OC_Installer{ // iterate the bad patterns foreach($blacklist as $bl) { - $cmd = 'grep -ri '.escapeshellarg($bl).' '.$folder.''; + $cmd = 'grep --include \\*.php -ri '.escapeshellarg($bl).' '.$folder.''; $result = exec($cmd); // bad pattern found if($result<>'') {