[Pkg-owncloud-commits] [owncloud-client] 50/159: Propagator: Debug output regarding OC-ETag

[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 b6fe5d2cffaa5d55637c152bd1e39e399ff442fd
Author: Markus Goetz <markus at woboq.com>
Date:   Fri Mar 27 13:16:11 2015 +0100

    Propagator: Debug output regarding OC-ETag
    
    We can remove this in some time, but currently it is interesting
    to see for what server setup is no ETag but an OC-ETag.
---
 src/libsync/owncloudpropagator_p.h | 9 +++++++--
 src/libsync/propagateupload.cpp    | 5 ++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/libsync/owncloudpropagator_p.h b/src/libsync/owncloudpropagator_p.h
index 4a89fe3..46b5881 100644
--- a/src/libsync/owncloudpropagator_p.h
+++ b/src/libsync/owncloudpropagator_p.h
@@ -33,9 +33,14 @@ inline QByteArray parseEtag(const char *header) {
 
 inline QByteArray getEtagFromReply(QNetworkReply *reply)
 {
-    QByteArray ret = parseEtag(reply->rawHeader("OC-ETag"));
+    QByteArray ocEtag = parseEtag(reply->rawHeader("OC-ETag"));
+    QByteArray etag = parseEtag(reply->rawHeader("ETag"));
+    QByteArray ret = ocEtag;
     if (ret.isEmpty()) {
-        ret = parseEtag(reply->rawHeader("ETag"));
+        ret = etag;
+    }
+    if (ocEtag.length() > 0 && ocEtag != etag) {
+        qDebug() << "Quite peculiar, we have an etag != OC-Etag [no problem!]" << etag << ocEtag;
     }
     return ret;
 }
diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp
index 4bcbe79..ce112c9 100644
--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -524,8 +524,8 @@ void PropagateUploadFileQNAM::slotPutFinished()
     // But if the upload is ongoing, because not all chunks were uploaded
     // yet, the upload can be stopped and an error can be displayed, because
     // the server hasn't registered the new file yet.
-    bool finished = job->reply()->hasRawHeader("ETag")
-            || job->reply()->hasRawHeader("OC-ETag");
+    QByteArray etag = getEtagFromReply(job->reply());
+    bool finished = etag.length() > 0;
 
     // Check if the file still exists
     const QString fullFilePath(_propagator->getFilePath(_item._file));
@@ -595,7 +595,6 @@ void PropagateUploadFileQNAM::slotPutFinished()
         _item._fileId = fid;
     }
 
-    QByteArray etag = getEtagFromReply(job->reply());
     _item._etag = etag;
 
     _item._responseTimeStamp = job->responseTimestamp();

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