From ef10c4c12494c9c33febe510815f6f0ab5e6f99c Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 4 May 2015 14:15:15 +0200 Subject: [PATCH] Remove hard-dependency on disabled output_buffering This removes the hard-dependency on output buffering as requested at https://github.com/owncloud/core/issues/16013 since a lot of distributions such as Debian and Ubuntu decided to use `4096` instead of the PHP recommended and documented default value of `off`. However, we still should encourage disabling this setting for improved performance and reliability thus the setting switches in `.user.ini` and `.htaccess` are remaining there. It is very likely that we in other cases also should disable the output buffering but aren't doing it everywhere and thus causing memory problems. Fixes https://github.com/owncloud/core/issues/16013 --- apps/files/appinfo/remote.php | 2 ++ lib/private/util.php | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php index b8dc68f1f811..325773a81ea7 100644 --- a/apps/files/appinfo/remote.php +++ b/apps/files/appinfo/remote.php @@ -30,6 +30,8 @@ // no php execution timeout for webdav set_time_limit(0); +// Turn off output buffering to prevent memory problems +\OC_Util::obEnd(); // Backends $authBackend = new \OC\Connector\Sabre\Auth(); diff --git a/lib/private/util.php b/lib/private/util.php index 102dc8c59db3..f4624cfe9647 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -672,7 +672,6 @@ public static function checkServer(\OCP\IConfig $config) { ), 'ini' => [ 'mbstring.func_overload' => 0, - 'output_buffering' => false, 'default_charset' => 'UTF-8', ], );