diff options
| author | Markus Goetz <markus@woboq.com> | 2014-10-30 13:54:58 +0300 |
|---|---|---|
| committer | Markus Goetz <markus@woboq.com> | 2014-10-30 13:54:58 +0300 |
| commit | cf6219bb6fd5cd5e94122e0b3a8966b3a3138805 (patch) | |
| tree | 1ce849db915b578ff4e03887c837563e2c64f5d3 /src/mirall | |
| parent | 45eeb5065fc0c1019c825530a6217fdd8b2e8e99 (diff) | |
NetworkJobs: Improve timeout handling and increase timeout by 5 sec
Diffstat (limited to 'src/mirall')
| -rw-r--r-- | src/mirall/networkjobs.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mirall/networkjobs.cpp b/src/mirall/networkjobs.cpp index d9c61ee9e..e5780df6e 100644 --- a/src/mirall/networkjobs.cpp +++ b/src/mirall/networkjobs.cpp @@ -51,7 +51,7 @@ AbstractNetworkJob::AbstractNetworkJob(Account *account, const QString &path, QO { _timer.setSingleShot(true); if (!AbstractNetworkJob::preOc7WasDetected) { - _timer.setInterval(10*1000); // default to 10 seconds. + _timer.setInterval(15*1000); // default to 15 seconds. } else { qDebug() << "Pre-oc7 server detected, adjusting timeout values"; _timer.setInterval(60*1000); // long PROPFINDs in oc6 might take too long @@ -104,6 +104,12 @@ void AbstractNetworkJob::setPath(const QString &path) void AbstractNetworkJob::setupConnections(QNetworkReply *reply) { connect(reply, SIGNAL(finished()), SLOT(slotFinished())); +#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) + connect(reply, SIGNAL(encrypted()), SIGNAL(networkActivity())); +#endif + connect(reply->manager(), SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)), SIGNAL(networkActivity())); + connect(reply, SIGNAL(sslErrors(QList<QSslError>)), SIGNAL(networkActivity())); + connect(reply, SIGNAL(metaDataChanged()), SIGNAL(networkActivity())); connect(reply, SIGNAL(downloadProgress(qint64,qint64)), SIGNAL(networkActivity())); connect(reply, SIGNAL(uploadProgress(qint64,qint64)), SIGNAL(networkActivity())); } |