Merge branch '3.4' into 4.4
* 3.4: [HttpFoundation] workaround PHP bug in the session module
This commit is contained in:
commit
e0e3cf634e
@ -71,6 +71,15 @@ abstract class AbstractSessionHandler implements \SessionHandlerInterface, \Sess
|
|||||||
$this->prefetchData = $this->read($sessionId);
|
$this->prefetchData = $this->read($sessionId);
|
||||||
$this->prefetchId = $sessionId;
|
$this->prefetchId = $sessionId;
|
||||||
|
|
||||||
|
if (\PHP_VERSION_ID < 70317 || (70400 <= \PHP_VERSION_ID && \PHP_VERSION_ID < 70405)) {
|
||||||
|
// work around https://bugs.php.net/79413
|
||||||
|
foreach (debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) as $frame) {
|
||||||
|
if (!isset($frame['class']) && isset($frame['function']) && \in_array($frame['function'], ['session_regenerate_id', 'session_create_id'], true)) {
|
||||||
|
return '' === $this->prefetchData;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return '' !== $this->prefetchData;
|
return '' !== $this->prefetchData;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11,6 +11,7 @@ validateId
|
|||||||
read
|
read
|
||||||
doRead: abc|i:123;
|
doRead: abc|i:123;
|
||||||
read
|
read
|
||||||
|
doRead: abc|i:123;
|
||||||
|
|
||||||
write
|
write
|
||||||
doWrite: abc|i:123;
|
doWrite: abc|i:123;
|
||||||
|
Reference in New Issue
Block a user