diff --git a/Kernel.php b/Kernel.php
index adb9a94727..c6476b615d 100644
--- a/Kernel.php
+++ b/Kernel.php
@@ -76,11 +76,11 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
private static $freshCache = [];
- public const VERSION = '4.4.45';
- public const VERSION_ID = 40445;
+ public const VERSION = '4.4.46';
+ public const VERSION_ID = 40446;
public const MAJOR_VERSION = 4;
public const MINOR_VERSION = 4;
- public const RELEASE_VERSION = 45;
+ public const RELEASE_VERSION = 46;
public const EXTRA_VERSION = '';
public const END_OF_MAINTENANCE = '11/2022';
diff --git a/Profiler/FileProfilerStorage.php b/Profiler/FileProfilerStorage.php
index d729994c1f..aa494691d1 100644
--- a/Profiler/FileProfilerStorage.php
+++ b/Profiler/FileProfilerStorage.php
@@ -115,19 +115,7 @@ public function purge()
*/
public function read($token): ?Profile
{
- if (!$token || !file_exists($file = $this->getFilename($token))) {
- return null;
- }
-
- if (\function_exists('gzcompress')) {
- $file = 'compress.zlib://'.$file;
- }
-
- if (!$data = unserialize(file_get_contents($file))) {
- return null;
- }
-
- return $this->createProfileFromData($token, $data);
+ return $this->doRead($token);
}
/**
@@ -169,14 +157,13 @@ public function write(Profile $profile): bool
'status_code' => $profile->getStatusCode(),
];
- $context = stream_context_create();
+ $data = serialize($data);
- if (\function_exists('gzcompress')) {
- $file = 'compress.zlib://'.$file;
- stream_context_set_option($context, 'zlib', 'level', 3);
+ if (\function_exists('gzencode')) {
+ $data = gzencode($data, 3);
}
- if (false === file_put_contents($file, serialize($data), 0, $context)) {
+ if (false === file_put_contents($file, $data, \LOCK_EX)) {
return false;
}
@@ -293,21 +280,34 @@ protected function createProfileFromData($token, $data, $parent = null)
}
foreach ($data['children'] as $token) {
- if (!$token || !file_exists($file = $this->getFilename($token))) {
- continue;
+ if (null !== $childProfile = $this->doRead($token, $profile)) {
+ $profile->addChild($childProfile);
}
+ }
- if (\function_exists('gzcompress')) {
- $file = 'compress.zlib://'.$file;
- }
+ return $profile;
+ }
- if (!$childData = unserialize(file_get_contents($file))) {
- continue;
- }
+ private function doRead($token, Profile $profile = null): ?Profile
+ {
+ if (!$token || !file_exists($file = $this->getFilename($token))) {
+ return null;
+ }
+
+ $h = fopen($file, 'r');
+ flock($h, \LOCK_SH);
+ $data = stream_get_contents($h);
+ flock($h, \LOCK_UN);
+ fclose($h);
- $profile->addChild($this->createProfileFromData($token, $childData, $profile));
+ if (\function_exists('gzdecode')) {
+ $data = @gzdecode($data) ?: $data;
}
- return $profile;
+ if (!$data = unserialize($data)) {
+ return null;
+ }
+
+ return $this->createProfileFromData($token, $data, $profile);
}
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy