mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
ok, well, my team is allowed to give me some slappage. :/ I now changed this sooo often and never realised the code portion is absolute rubbish... with ini_get returning something completely different. Now, this should work (at least for PHP 5.2.x) - tested all 16 possible combinations of triggering errors before and after headers sent, with and without gzip compression, with and without output buffering. Now, please work for others too...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8594 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
6ad76d9b62
commit
374093d615
1 changed files with 4 additions and 4 deletions
|
@ -2941,15 +2941,15 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
|
||||||
if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false)
|
if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false)
|
||||||
{
|
{
|
||||||
// flush the content, else we get a white page if output buffering is on
|
// flush the content, else we get a white page if output buffering is on
|
||||||
if (strtolower(@ini_get('output_buffering')) !== 'off')
|
if ((int) @ini_get('output_buffering') === 1 || strtolower(@ini_get('output_buffering')) === 'on')
|
||||||
{
|
{
|
||||||
@ob_end_flush();
|
@ob_flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Another quick fix for those having gzip compression enabled
|
// Another quick fix for those having gzip compression enabled, but do not flush if the coder wants to catch "something". ;)
|
||||||
if ($config['gzip_compress'])
|
if ($config['gzip_compress'])
|
||||||
{
|
{
|
||||||
if (@extension_loaded('zlib') && !headers_sent())
|
if (@extension_loaded('zlib') && !headers_sent() && !ob_get_level())
|
||||||
{
|
{
|
||||||
@ob_flush();
|
@ob_flush();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue