diff options
author | Lukas Reschke <lukas@owncloud.com> | 2015-05-04 14:15:15 +0200 |
---|---|---|
committer | Lukas Reschke <lukas@owncloud.com> | 2015-05-04 14:15:15 +0200 |
commit | 4b9e0349687512c6ea4435b2dcdb36ce7a3f02fc (patch) | |
tree | f689b57f6337ee6b1772689bb9b4404e7124fe2d | |
parent | 17fedc80dac7acd3d85f1f132455e94d4fd920c6 (diff) | |
download | nextcloud-server-4b9e0349687512c6ea4435b2dcdb36ce7a3f02fc.tar.gz nextcloud-server-4b9e0349687512c6ea4435b2dcdb36ce7a3f02fc.zip |
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
-rw-r--r-- | apps/files/appinfo/remote.php | 2 | ||||
-rw-r--r-- | lib/private/util.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php index b8dc68f1f81..325773a81ea 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 102dc8c59db..f4624cfe964 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -672,7 +672,6 @@ class OC_Util { ), 'ini' => [ 'mbstring.func_overload' => 0, - 'output_buffering' => false, 'default_charset' => 'UTF-8', ], ); |