revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-22 21:40:55 +01:00
Code Issues Releases Wiki Activity

Use JSON, not PHP serialization, for XHProf profiles.

Browse source
This commit is contained in:
epriestley 2014-02-24 04:16:52 -08:00
parent f49470f9bf
commit e7254944ec
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/aphront/console/plugin/xhprof/DarkConsoleXHProfPluginAPI.php
View file

@ -144,7 +144,7 @@ final class DarkConsoleXHProfPluginAPI {
} }
$data = xhprof_disable(); $data = xhprof_disable();
$data = serialize($data); $data = @json_encode($data);
self::$profilerRunning = false; self::$profilerRunning = false;
// Since these happen on GET we can't do guarded writes. These also // Since these happen on GET we can't do guarded writes. These also

2
src/applications/xhprof/controller/PhabricatorXHProfProfileController.php
View file

@ -21,7 +21,7 @@ final class PhabricatorXHProfProfileController
} }
$data = $file->loadFileData(); $data = $file->loadFileData();
$data = unserialize($data); $data = @json_decode($data, true);
if (!$data) { if (!$data) {
throw new Exception("Failed to unserialize XHProf profile!"); throw new Exception("Failed to unserialize XHProf profile!");
} }