From e8c7dd8c7cc6741bfb04f66f427c03514fe4b710 Mon Sep 17 00:00:00 2001 From: Roman Vanicek Date: Tue, 12 Nov 2024 18:12:24 +0100 Subject: [PATCH 1/3] Propagate lock in PROPPATCH in WebDAV --- internal/http/services/owncloud/ocdav/proppatch.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/http/services/owncloud/ocdav/proppatch.go b/internal/http/services/owncloud/ocdav/proppatch.go index 6ead723f5e..b6fcf1f97d 100644 --- a/internal/http/services/owncloud/ocdav/proppatch.go +++ b/internal/http/services/owncloud/ocdav/proppatch.go @@ -133,12 +133,14 @@ func (s *svc) handleProppatch(ctx context.Context, w http.ResponseWriter, r *htt rreq := &provider.UnsetArbitraryMetadataRequest{ Ref: ref, ArbitraryMetadataKeys: []string{""}, + LockId: requestLockToken(r), } sreq := &provider.SetArbitraryMetadataRequest{ Ref: ref, ArbitraryMetadata: &provider.ArbitraryMetadata{ Metadata: map[string]string{}, }, + LockId: requestLockToken(r), } acceptedProps := []xml.Name{} From 8a47d3698f3b3759eb709149a100b510904bac0a Mon Sep 17 00:00:00 2001 From: Roman Vanicek Date: Fri, 15 Nov 2024 12:18:15 +0100 Subject: [PATCH 2/3] Changelog entry --- changelog/unreleased/propagate-lock-proppatch.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelog/unreleased/propagate-lock-proppatch.md diff --git a/changelog/unreleased/propagate-lock-proppatch.md b/changelog/unreleased/propagate-lock-proppatch.md new file mode 100644 index 0000000000..3a7ec91f76 --- /dev/null +++ b/changelog/unreleased/propagate-lock-proppatch.md @@ -0,0 +1,2 @@ +Bugfix: Propagate lock in PROPPATCH +Clients using locking (ie. Windows) could not create/copy files over webdav as file seemed to be locked. \ No newline at end of file From d44b415e7370b4c59247c0e8c2e76815f425eea6 Mon Sep 17 00:00:00 2001 From: Roman Vanicek Date: Fri, 15 Nov 2024 12:25:21 +0100 Subject: [PATCH 3/3] Another changelog try --- changelog/unreleased/propagate-lock-proppatch.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/changelog/unreleased/propagate-lock-proppatch.md b/changelog/unreleased/propagate-lock-proppatch.md index 3a7ec91f76..7fcdf23f97 100644 --- a/changelog/unreleased/propagate-lock-proppatch.md +++ b/changelog/unreleased/propagate-lock-proppatch.md @@ -1,2 +1,4 @@ Bugfix: Propagate lock in PROPPATCH -Clients using locking (ie. Windows) could not create/copy files over webdav as file seemed to be locked. \ No newline at end of file +Clients using locking (ie. Windows) could not create/copy files over webdav as file seemed to be locked. + +https://github.com/cs3org/reva/pull/4928 \ No newline at end of file