Commit ec4280de authored by Sebastian Kummer's avatar Sebastian Kummer

Merge pull request #157 in ZP/z-push from...

Merge pull request #157 in ZP/z-push from bugfix/ZP-645-php-5.4-obstart-needs-an-extra-flag-revert to develop

* commit '749e44a8':
  ZP-645 Revert "PHP 5.4+ ob_start() needs an extra flag to allow".

(cherry picked from commit 52e58756)
parent ca01a386
...@@ -43,13 +43,7 @@ ...@@ -43,13 +43,7 @@
* Consult LICENSE file for details * Consult LICENSE file for details
************************************************/ ************************************************/
ob_start(null, 1048576);
if (version_compare(phpversion(), '5.4.0') < 0) {
ob_start(null, 1048576);
}
else {
ob_start(null, 1048576, PHP_OUTPUT_HANDLER_STDFLAGS);
}
// ignore user abortions because this can lead to weird errors - see ZP-239 // ignore user abortions because this can lead to weird errors - see ZP-239
ignore_user_abort(true); ignore_user_abort(true);
...@@ -298,4 +292,4 @@ include_once('version.php'); ...@@ -298,4 +292,4 @@ include_once('version.php');
// end gracefully // end gracefully
ZLog::WriteEnd(); ZLog::WriteEnd();
?> ?>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment