summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2021-04-27 06:15:16 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2021-04-27 09:12:01 +0200
commita3843f1cb0095e843bc4ee7ed20802147f63c7ba (patch)
treedbc4b970f4bb8237dfc87d47cddb6f3fa2190a47 /framework
parentfeeaa5d3ca0c784344549816fbaab2c8716b4105 (diff)
tdf#141164: Add an expert config for WebDAV redirection detection
Since commit 20b1e6440aacab043753e93be4499e939a80b05b, we detect redirected WebDAV paths, and substitute them with original WebDAV URLs to allow retrieving additional information like lock owner. The new officecfg::Office::Common::Load::DetectWebDAVRedirection allows to disable the detection, and opt to older way of use of Windows Redirector, taking advantage of its cookie handling until we implement own proper cookie handling. Change-Id: I1510a016f40dbe81dcba9aa4fd50eda73a6d9f22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114686 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'framework')
-rw-r--r--framework/source/loadenv/loadenv.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 3821654df008..cd83d9403748 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -251,7 +251,8 @@ void LoadEnv::startLoading(const OUString& sURL, const uno::Sequence<beans::Prop
m_bLoaded = false;
OUString aRealURL;
- if (!tools::IsMappedWebDAVPath(sURL, &aRealURL))
+ if (!officecfg::Office::Common::Load::DetectWebDAVRedirection::get()
+ || !tools::IsMappedWebDAVPath(sURL, &aRealURL))
aRealURL = sURL;
// try to find out, if it's really a content, which can be loaded or must be "handled"