diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-05-04 16:43:32 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-05-04 16:43:32 +0200 |
| commit | 08b98a8ede6593c5101abdd2c8a4020dda4729ae (patch) | |
| tree | 4b47d768538ac8fd887c80483507eacecb8e4552 | |
| parent | e5c5c908a3cb520edca648a1ae9e139b1bffe0e4 (diff) | |
| parent | 4b9e0349687512c6ea4435b2dcdb36ce7a3f02fc (diff) | |
| download | nextcloud-server-08b98a8ede6593c5101abdd2c8a4020dda4729ae.tar.gz nextcloud-server-08b98a8ede6593c5101abdd2c8a4020dda4729ae.zip | |
Merge pull request #16042 from owncloud/fix-output-buffering
Remove hard-dependency on disabled output_buffering
| -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', ], ); |