From: Olivier Goffart <ogoffart@woboq.com>
Date: Mon, 15 Oct 2018 16:05:51 +0000 (+0200)
Subject: Fixup commit 835c9163374f42003aa2f7795ade3f4ff62c8877
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~491
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2f8c77c54f1b3a0c9283c63031daee036688d130;p=nextcloud-desktop.git

Fixup commit 835c9163374f42003aa2f7795ade3f4ff62c8877

The previous code considered the also HTTP 207 code without the
application/xml header to have this message.
httpCode 0 does not make much sense anyway.

This change the behavior to consider any 2xx without the xml header
to show this error message
---

diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
index d582ed1e1..06bd6998a 100644
--- a/src/libsync/discoveryphase.cpp
+++ b/src/libsync/discoveryphase.cpp
@@ -354,7 +354,7 @@ void DiscoverySingleDirectoryJob::lsJobFinishedWithErrorSlot(QNetworkReply *r)
     QString httpReason = r->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString();
     QString msg = r->errorString();
     qCWarning(lcDiscovery) << "LSCOL job error" << r->errorString() << httpCode << r->error();
-    if (httpCode == 0 && r->error() == QNetworkReply::NoError
+    if (r->error() == QNetworkReply::NoError
         && !contentType.contains("application/xml; charset=utf-8")) {
         msg = tr("Server error: PROPFIND reply is not XML formatted!");
     }