Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFelix Weilbach <felix.weilbach@nextcloud.com>2021-05-20 15:17:16 +0300
committerMatthieu Gallien (Rebase PR Action) <matthieu_gallien@yahoo.fr>2021-07-16 15:42:02 +0300
commit3e61bdc4318827d486221e56fbca3804b639fdd7 (patch)
treefee7ed35744c9c5523723de4509defb0b5325bed /src
parent545592c472b8bc26fb7410683b5439713898b5ee (diff)
Use dav instead of webdav
Fixes #3342 Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
Diffstat (limited to 'src')
-rw-r--r--src/gui/owncloudsetupwizard.cpp2
-rw-r--r--src/libsync/networkjobs.cpp2
-rw-r--r--src/libsync/theme.cpp2
-rw-r--r--src/libsync/theme.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
index b28df19de..2972f0b11 100644
--- a/src/gui/owncloudsetupwizard.cpp
+++ b/src/gui/owncloudsetupwizard.cpp
@@ -465,7 +465,7 @@ void OwncloudSetupWizard::slotCreateLocalAndRemoteFolders(const QString &localFo
*
* Purpose: Don't rely on unsafe paths, be extra careful.
*
- * Example: https://cloud.example.com/remote.php/webdav//
+ * Example: https://cloud.example.com/remote.php/dav//
*
*/
qCInfo(lcWizard) << "Sanitize got URL path:" << QString(_ocWizard->account()->url().toString() + '/' + _ocWizard->account()->davPath() + remoteFolder);
diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
index 65b1b5474..763367988 100644
--- a/src/libsync/networkjobs.cpp
+++ b/src/libsync/networkjobs.cpp
@@ -403,7 +403,7 @@ bool LsColJob::finished()
connect(&parser, &LsColXMLParser::finishedWithoutError,
this, &LsColJob::finishedWithoutError);
- QString expectedPath = reply()->request().url().path(); // something like "/owncloud/remote.php/webdav/folder"
+ QString expectedPath = reply()->request().url().path(); // something like "/owncloud/remote.php/dav/folder"
if (!parser.parse(reply()->readAll(), &_folderInfos, expectedPath)) {
// XML parse error
emit finishedWithError(reply());
diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index 8729ec0a9..c14b315fe 100644
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -645,7 +645,7 @@ bool Theme::wizardSelectiveSyncDefaultNothing() const
QString Theme::webDavPath() const
{
- return QLatin1String("remote.php/webdav/");
+ return QLatin1String("remote.php/dav/");
}
QString Theme::webDavPathNonShib() const
diff --git a/src/libsync/theme.h b/src/libsync/theme.h
index 4e12c24cc..4c1dd113f 100644
--- a/src/libsync/theme.h
+++ b/src/libsync/theme.h
@@ -341,7 +341,7 @@ public:
* Alternative path on the server that provides access to the webdav capabilities
*
* Attention: Make sure that this string does NOT have a leading slash and that
- * it has a trailing slash, for example "remote.php/webdav/".
+ * it has a trailing slash, for example "remote.php/dav/".
*/
virtual QString webDavPath() const;
virtual QString webDavPathNonShib() const;