mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-22 21:15:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix: Apply http2 patch from owncloud #1573 - only with Qt >= 5.8

Browse source 
Drone builds failed with Qt 5.7 and we introduce a new ifdef here
to avoid patching specifically for Ubuntu Xenial only.

Signed-off-by: Michael Schuster <michael@schuster.ms>
This commit is contained in:
Michael Schuster 2019-11-14 02:39:06 +01:00
parent 9e8498ad4e
commit 5131463644
No known key found for this signature in database
GPG key ID: 00819E3BF4177B28
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libsync/abstractnetworkjob.cpp
View file

@ -160,7 +160,8 @@ void AbstractNetworkJob::slotFinished()
qCWarning(lcNetworkJob) << "SslHandshakeFailedError: " << errorString() << " : can be caused by a webserver wanting SSL client certificates";
}
// Qt doesn't yet transparently resend HTTP2 requests, do so here
#if (QT_VERSION >= 0x050800)
// Qt doesn't yet transparently resend HTTP2 requests, do so here
const auto maxHttp2Resends = 5;
QByteArray verb = requestVerb(*reply());
if (_reply->error() == QNetworkReply::ContentReSendError
@ -190,6 +191,7 @@ void AbstractNetworkJob::slotFinished()
return;
}
}
#endif
if (_reply->error() != QNetworkReply::NoError) {
if (!_ignoreCredentialFailure || _reply->error() != QNetworkReply::AuthenticationRequiredError) {

2
src/libsync/abstractnetworkjob.h
View file

@ -189,7 +189,9 @@ private:
QString _path;
QTimer _timer;
int _redirectCount = 0;
#if (QT_VERSION >= 0x050800)
int _http2ResendCount = 0;
#endif
// Set by the xyzRequest() functions and needed to be able to redirect
// requests, should it be required.