[Pkg-owncloud-commits] [owncloud-client] 242/332: Merge remote-tracking branch 'origin/1.6' into il

[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 f004d5085dd41696b3ccf59fcb703f7ef0ef724f
Merge: 81d7867 3d0c009
Author: Markus Goetz <markus at woboq.com>
Date:   Fri Jul 25 12:37:27 2014 +0200

    Merge remote-tracking branch 'origin/1.6' into il
    
    Conflicts:
    	VERSION.cmake

 ChangeLog                          | 5 +++++
 cmake/modules/NSIS.template.in     | 6 +++---
 doc/ocdoc                          | 2 +-
 src/creds/httpcredentials.cpp      | 2 ++
 src/mirall/owncloudpropagator.cpp  | 9 ++++++++-
 src/mirall/owncloudsetupwizard.cpp | 2 ++
 src/mirall/propagator_qnam.cpp     | 3 ++-
 7 files changed, 23 insertions(+), 6 deletions(-)

diff --cc src/mirall/propagator_qnam.cpp
index 6c0808c,72668c0..aeb2619
--- a/src/mirall/propagator_qnam.cpp
+++ b/src/mirall/propagator_qnam.cpp
@@@ -420,13 -400,9 +420,14 @@@ void GETFileJob::start() 
          req.setRawHeader(it.key(), it.value());
      }
  
 -    setReply(davRequest("GET", path(), req));
 +    if (_directDownloadUrl.isEmpty()) {
 +        setReply(davRequest("GET", path(), req));
 +    } else {
 +        // Use direct URL
 +        setReply(davRequest("GET", _directDownloadUrl, req));
 +    }
      setupConnections(reply());
+     reply()->setReadBufferSize(128 * 1024);
  
      if( reply()->error() != QNetworkReply::NoError ) {
          qWarning() << Q_FUNC_INFO << " Network error: " << reply()->errorString();

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