nextcloud
/
server
mirror of https://github.com/nextcloud/server
0
0
Fork 0
Code Issues Releases Wiki Activity

Prevent PHP request to get killed when using fclose callback (#26775) 

* Prevent PHP request to get killed when using fclose callback

* Add ignore_user_abort everywhere where the time limit is set to 0

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Vincent Petry 2017-01-13 12:55:08 +01:00 committed by Robin Appelman
parent 012e521239
commit 0aaf209c66
No known key found for this signature in database
GPG Key ID: 50F2B59C6DEBBCFE
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/dav/appinfo/v1/webdav.php
View File

@ -25,6 +25,7 @@
// no php execution timeout for webdav
set_time_limit(0);
ignore_user_abort(true);
// Turn off output buffering to prevent memory problems
\OC_Util::obEnd();

1
apps/dav/appinfo/v2/remote.php
View File

@ -21,6 +21,7 @@
*/
// no php execution timeout for webdav
set_time_limit(0);
ignore_user_abort(true);
// Turn off output buffering to prevent memory problems
\OC_Util::obEnd();

2
lib/private/Files/View.php
View File

@ -1146,6 +1146,8 @@ class View {
$unlockLater = false;
if ($this->lockingEnabled && $operation === 'fopen' && is_resource($result)) {
$unlockLater = true;
// make sure our unlocking callback will still be called if connection is aborted
ignore_user_abort(true);
$result = CallbackWrapper::wrap($result, null, null, function () use ($hooks, $path) {
if (in_array('write', $hooks)) {
$this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE);

1
lib/private/legacy/files.php
View File

@ -148,6 +148,7 @@ class OC_Files {
$streamer->sendHeaders($name);
$executionTime = intval(OC::$server->getIniWrapper()->getNumeric('max_execution_time'));
set_time_limit(0);
ignore_user_abort(true);
if ($getType === self::ZIP_FILES) {
foreach ($files as $file) {
$file = $dir . '/' . $file;