Skip to content
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.

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

[stable-3.15] when locking a file set If-Match header to ensure etag is correct #7620

Merged
merged 1 commit into from
Dec 9, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Dec 9, 2024

Backport of PR #7595

@backportbot backportbot bot requested review from claucambra and mgallien December 9, 2024 10:14
@backportbot backportbot bot added this to the 3.15.1 milestone Dec 9, 2024
the file being locked may have been changed sinc the client synced it

so the server side file may have a modified etag. In such cases we do
not want to lock the file and would rather sync the nex server changes
before being able to lock the file

that would ensure that on client side the file being locked is matching
teh state of teh file on server side and would prevent inadvertently
overriding server changes

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien mgallien force-pushed the backport/7595/stable-3.15 branch from 3f2ecb9 to bd741dc Compare December 9, 2024 13:39
@mgallien mgallien enabled auto-merge December 9, 2024 13:40
Copy link

sonarcloud bot commented Dec 9, 2024

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-7620-bd741dcd3e39166c72435ea2846ce8685b64fb23-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@mgallien mgallien merged commit f91a2c6 into stable-3.15 Dec 9, 2024
13 of 16 checks passed
@mgallien mgallien deleted the backport/7595/stable-3.15 branch December 9, 2024 14:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants