Skip to content

[stable9.1] Prevent PHP request to get killed when using fclose callback #26939

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 17, 2017
Merged

[stable9.1] Prevent PHP request to get killed when using fclose callback #26939

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b841ab
Prevent PHP request to get killed when using fclose callback
Dec 2, 2016
cc82ca9
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
Next Next commit
Prevent PHP request to get killed when using fclose callback
  • Loading branch information
Vincent Petry committed Jan 13, 2017
commit 9b841ab8fa17ed43734de780e2265a3e9c90b8f1
2 changes: 2 additions & 0 deletions lib/private/Files/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,6 +1144,8 @@ private function basicOperation($operation, $path, $hooks = [], $extraParam = nu
$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);
Expand Down