[Pkg-owncloud-commits] [owncloud-client] 52/164: Discovery: Fix handling of 503 on a folder. #2884

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 08c33cd1dc1176198b74b0d79e6b92c3b2060464
Author: Christian Kamm <kamm at incasoftware.de>
Date:   Wed Feb 25 07:55:06 2015 +0100

    Discovery: Fix handling of 503 on a folder. #2884
---
 src/libsync/discoveryphase.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
index e9b7016..1916ba8 100644
--- a/src/libsync/discoveryphase.cpp
+++ b/src/libsync/discoveryphase.cpp
@@ -279,10 +279,10 @@ void DiscoverySingleDirectoryJob::lsJobFinishedWithErrorSlot(QNetworkReply *r)
     QString msg = r->errorString();
     int errnoCode = 0;
     qDebug() << Q_FUNC_INFO << r->errorString() << httpCode << r->error();
-    if (r->error() != QNetworkReply::NoError) {
-        errnoCode = EIO;
-    } else if (httpCode != 207) {
+    if (httpCode != 0 && httpCode != 207) {
         errnoCode = get_errno_from_http_errcode(httpCode);
+    } else if (r->error() != QNetworkReply::NoError) {
+        errnoCode = EIO;
     } else if (!contentType.contains("application/xml; charset=utf-8")) {
         msg = QLatin1String("Server error: PROPFIND reply is not XML formatted!");
         errnoCode = ERRNO_WRONG_CONTENT;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git