[Pkg-owncloud-commits] [owncloud-client] 94/164: PropagateUpload: also read the OC-ErrorString header from the poll job

[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 46d5d22f72b8e9ce6570b2c2472a235aea54dc1e
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Mar 4 12:00:25 2015 +0100

    PropagateUpload:  also read the OC-ErrorString header from the poll job
---
 src/libsync/propagateupload.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp
index 15027fa..1d2fccf 100644
--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -107,6 +107,11 @@ bool PollJob::finished()
         _item._httpErrorCode = reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
         _item._status = classifyError(err, _item._httpErrorCode);
         _item._errorString = reply()->errorString();
+
+        if (reply()->hasRawHeader("OC-ErrorString")) {
+            _item._errorString = reply()->rawHeader("OC-ErrorString");
+        }
+
         if (_item._status == SyncFileItem::FatalError || _item._httpErrorCode >= 400) {
             if (_item._status != SyncFileItem::FatalError
                     && _item._httpErrorCode != 503) {

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