Skip to content

[stable30] Bug/48678/restore dav error response #49481

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
kesselb merged 6 commits into from
Feb 15, 2025
Merged

[stable30] Bug/48678/restore dav error response #49481

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
44ad579
Revert "fix: Override start method of \Sabre\DAV\Server to remove exc…
kesselb Oct 30, 2024
cd296eb
Revert "fix: Drop unnecessary exit"
kesselb Oct 30, 2024
e8a5e0c
Revert "fix(dav): Always respond custom error page on exceptions"
kesselb Oct 30, 2024
d7b1ecb
fix: Replace the TypeError to prevent exposing the installation path
kesselb Nov 22, 2024
33fb176
fix: make locked exception path relative to the view
icewind1991 Jan 28, 2025
6cec3ee
fix: use relative paths for upload locks
icewind1991 Feb 3, 2025
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
fix: use relative paths for upload locks 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @kesselb
icewind1991 authored and kesselb committed Feb 15, 2025
commit 6cec3eef491b6191bdfd16f2f3c6a2307f471e1e
4 changes: 2 additions & 2 deletions apps/dav/lib/Connector/Sabre/Directory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ public function createFile($name, $data = null) {

// only allow 1 process to upload a file at once but still allow reading the file while writing the part file
$node->acquireLock(ILockingProvider::LOCK_SHARED);
$this->fileView->lockFile($path . '.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
$this->fileView->lockFile($this->path . '/' . $name . '.upload.part', ILockingProvider::LOCK_EXCLUSIVE);

$result = $node->put($data);

$this->fileView->unlockFile($path . '.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
$this->fileView->unlockFile($this->path . '/' . $name . '.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
$node->releaseLock(ILockingProvider::LOCK_SHARED);
return $result;
} catch (\OCP\Files\StorageNotAvailableException $e) {
Expand Down
Loading