mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove deleteFromOpcodeCache & clearOpcodeCache 

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
This commit is contained in:
Daniel Kesselberg 2019-01-30 17:36:14 +01:00
parent 1638f89e89
commit 9104e028a3
No known key found for this signature in database
GPG Key ID: 36E3664E099D0614
2 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/Config.php
View File

@ -265,10 +265,8 @@ class Config {
flock($filePointer, LOCK_UN);
fclose($filePointer);
// Try invalidating the opcache just for the file we wrote...
if (!\OC_Util::deleteFromOpcodeCache($this->configFilePath)) {
// But if that doesn't work, clear the whole cache.
\OC_Util::clearOpcodeCache();
if (function_exists('opcache_invalidate')) {
@opcache_invalidate($this->configFilePath, true);
}
}
}

31
lib/private/legacy/util.php
View File

@ -1323,37 +1323,6 @@ class OC_Util {
return $theme;
}
/**
* Clear a single file from the opcode cache
* This is useful for writing to the config file
* in case the opcode cache does not re-validate files
* Returns true if successful, false if unsuccessful:
* caller should fall back on clearing the entire cache
* with clearOpcodeCache() if unsuccessful
*
* @param string $path the path of the file to clear from the cache
* @return bool true if underlying function returns true, otherwise false
*/
public static function deleteFromOpcodeCache($path): bool {
if (!empty($path) && function_exists('opcache_invalidate')) {
return @opcache_invalidate($path); // Zend OpCache >= 7.0.0, PHP >= 5.5.0
}
return false;
}
/**
* Clear the opcode cache if one exists
* This is necessary for writing to the config file
* in case the opcode cache does not re-validate files
*
* @return void
*/
public static function clearOpcodeCache(): void {
if (function_exists('opcache_reset')) {
@opcache_reset(); // Opcache (PHP >= 5.5)
}
}
/**
* Normalize a unicode string
*