Skip to content

Commit

Permalink
Remove hard-dependency on disabled output_buffering
Browse files Browse the repository at this point in the history
This removes the hard-dependency on output buffering as requested at owncloud#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 owncloud#16013
  • Loading branch information
LukasReschke authored and mmattel committed May 22, 2015
1 parent 2b5275e commit ef10c4c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 2 additions & 0 deletions apps/files/appinfo/remote.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion lib/private/util.php
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,6 @@ public static function checkServer(\OCP\IConfig $config) {
),
'ini' => [
'mbstring.func_overload' => 0,
'output_buffering' => false,
'default_charset' => 'UTF-8',
],
);
Expand Down

0 comments on commit ef10c4c

Please sign in to comment.