Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 2 commits into from
Jan 13, 2017
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
944ad7d
Prevent PHP request to get killed when using fclose callback
Dec 2, 2016
5a414b6
Add ignore_user_abort everywhere where the time limit is set to 0
Dec 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add ignore_user_abort everywhere where the time limit is set to 0
  • Loading branch information
Vincent Petry committed Dec 19, 2016
commit 5a414b628e35ececdbed2ba9a5a84a89bf102582
1 change: 1 addition & 0 deletions apps/dav/appinfo/v1/webdav.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,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();
Expand Down
1 change: 1 addition & 0 deletions apps/dav/appinfo/v2/remote.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 1 addition & 0 deletions lib/private/legacy/files.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ public static function get($dir, $files, $params = null) {
$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;
Expand Down