diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2023-04-18 14:25:37 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2023-04-26 10:15:17 +0200 |
| commit | 30f770d015d234465c1da1e548c7e02250c78286 (patch) | |
| tree | 02cbc2b0a63e634b13e41a13dcc62b5417a1ab69 | |
| parent | b91ea614c0b753ab3d378acd0e2db8262e9dbd72 (diff) | |
Fix tdf#155004: ucb: webdav-curl: carry over Class1 bit only if set
With d6182cb6704c06f33d284874b9fe96c85cce5bf5 there are cases when a
webdav server inadvertendly releases the lock. Lets apply the fix only
if the Class1 flag is actually set.
Change-Id: I85e5253c7df0980f373d2dea788c331b81ed4a82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150552
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: Jenkins
(cherry picked from commit 5e8c27e2dbb47a207364f3c44b5ea8e7ec3be73a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150929
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | ucb/source/ucp/webdav-curl/DAVTypes.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ucb/source/ucp/webdav-curl/DAVTypes.cxx b/ucb/source/ucp/webdav-curl/DAVTypes.cxx index d5b255c175cd..e41c5426e959 100644 --- a/ucb/source/ucp/webdav-curl/DAVTypes.cxx +++ b/ucb/source/ucp/webdav-curl/DAVTypes.cxx @@ -168,7 +168,10 @@ void DAVOptionsCache::addDAVOptions( DAVOptions & rDAVOptions, const sal_uInt32 // tdf#153642 keep cached Class1 bit at aDAVOptionsException to avoid of // losing the ability to resave the document within the lifetime because // of disabled DAV detection in getResourceType() - rDAVOptions.setClass1( (*it).second.isClass1() ); + if ((*it).second.isClass1()) + { + rDAVOptions.setClass1( (*it).second.isClass1() ); + } } // not in cache, add it TimeValue t1; |