bug #15291 [HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3 (nicolas-grekas)
This PR was merged into the 2.6 branch.
Discussion
----------
[HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #15284
| License | MIT
| Doc PR | -
Commits
-------
1adb065
[HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3
This commit is contained in:
commit
dcb0255b35
@ -1242,7 +1242,7 @@ class Response
|
|||||||
{
|
{
|
||||||
$status = ob_get_status(true);
|
$status = ob_get_status(true);
|
||||||
$level = count($status);
|
$level = count($status);
|
||||||
$flags = PHP_VERSION_ID >= 50400 ? PHP_OUTPUT_HANDLER_REMOVABLE | ($flush ? PHP_OUTPUT_HANDLER_FLUSHABLE : PHP_OUTPUT_HANDLER_CLEANABLE) : -1;
|
$flags = defined('PHP_OUTPUT_HANDLER_REMOVABLE') ? PHP_OUTPUT_HANDLER_REMOVABLE | ($flush ? PHP_OUTPUT_HANDLER_FLUSHABLE : PHP_OUTPUT_HANDLER_CLEANABLE) : -1;
|
||||||
|
|
||||||
while ($level-- > $targetLevel && ($s = $status[$level]) && (!isset($s['del']) ? !isset($s['flags']) || $flags === ($s['flags'] & $flags) : $s['del'])) {
|
while ($level-- > $targetLevel && ($s = $status[$level]) && (!isset($s['del']) ? !isset($s['flags']) || $flags === ($s['flags'] & $flags) : $s['del'])) {
|
||||||
if ($flush) {
|
if ($flush) {
|
||||||
|
Reference in New Issue
Block a user