diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2021-03-23 18:34:25 +0300 |
|---|---|---|
| committer | Hannah von Reth <vonreth@kde.org> | 2021-03-23 18:50:42 +0300 |
| commit | 6b9abee1abb6e3a1d5497a88c86a0821d3f29e43 (patch) | |
| tree | 47b9adb763e33823fe992dc0fdfa22626dd59f55 /src/libsync/networkjobs.cpp | |
| parent | 22fc548671b2d93283dc360651194f047840de1c (diff) | |
Don't try to connect to /owncloud
Fixes: #8273
Diffstat (limited to 'src/libsync/networkjobs.cpp')
| -rw-r--r-- | src/libsync/networkjobs.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp index 7d8d9f8d9..f02c3c102 100644 --- a/src/libsync/networkjobs.cpp +++ b/src/libsync/networkjobs.cpp @@ -409,13 +409,8 @@ bool LsColJob::finished() /*********************************************************************************************/ -namespace { - const QString statusphpC() { return QStringLiteral("status.php"); } - const QString owncloudDirC() { return QStringLiteral("owncloud/"); } -} - CheckServerJob::CheckServerJob(AccountPtr account, QObject *parent) - : AbstractNetworkJob(account, statusphpC(), parent) + : AbstractNetworkJob(account, QStringLiteral("status.php"), parent) , _subdirFallback(false) { setIgnoreCredentialFailure(true); @@ -531,16 +526,6 @@ bool CheckServerJob::finished() mergeSslConfigurationForSslButton(reply()->sslConfiguration(), account()); - // The server installs to /owncloud. Let's try that if the file wasn't found - // at the original location - if ((reply()->error() == QNetworkReply::ContentNotFoundError) && (!_subdirFallback)) { - _subdirFallback = true; - setPath(owncloudDirC() + statusphpC()); - start(); - qCInfo(lcCheckServerJob) << "Retrying with" << reply()->url(); - return false; - } - const QByteArray body = reply()->peek(4 * 1024); const int httpStatus = reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); if (reply()->error() == QNetworkReply::TooManyRedirectsError) { |