PropagateDownload: disable fallback to owncloud if direct download fails

(cherry picked from commit 89376e14d6)

src/libsync/account.cpp

@@ -480,7 +480,11 @@ void Account::slotHandleErrors(QNetworkReply *reply , QList<QSslError> errors)
         addApprovedCerts(approvedCerts);
         // all ssl certs are known and accepted. We can ignore the problems right away.
 //         qDebug() << out << "Certs are known and trusted! This is not an actual error.";
-        reply->ignoreSslErrors();
+
+        // Warning: Do *not* use ignoreSslErrors() (without args) here:
+        // it permanently ignores all SSL errors for this host, even
+        // certificate changes.
+        reply->ignoreSslErrors(errors);
     } else {
         _treatSslErrorsAsFailure = true;
         return;

src/libsync/propagatedownload.cpp

@@ -400,13 +400,13 @@ void PropagateDownloadFileQNAM::slotGetFinished()
             _propagator->_journal->setDownloadInfo(_item._file, SyncJournalDb::DownloadInfo());
         }
 
-        if(!_item._directDownloadUrl.isEmpty() && err != QNetworkReply::OperationCanceledError) {
+        /* if(!_item._directDownloadUrl.isEmpty() && err != QNetworkReply::OperationCanceledError) {
             // If this was with a direct download, retry without direct download
             qWarning() << "Direct download of" << _item._directDownloadUrl << "failed. Retrying through owncloud.";
             _item._directDownloadUrl.clear();
             start();
             return;
-        }
+        }*/
 
         // This gives a custom QNAM (by the user of libowncloudsync) to abort() a QNetworkReply in its metaDataChanged() slot and
         // set a custom error string to make this a soft error. In contrast to the default hard error this won't bring down