diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-14 01:00:21 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-03-14 10:49:29 +0100 |
commit | 32084b073362e52df597cc388cf54f5173e20b0d (patch) | |
tree | 9a6f881f0ab0bc22e3a491fae81d494815cc514f /src/network | |
parent | 8d4e8217fdc01417ab8ea33303dd0ce7f769d10e (diff) | |
parent | eb25acc05b177c49eb81b190a476854fbf3c6fb1 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/tools/qcollator_win.cpp
Change-Id: I6d806d7c58b2057ebde3ad915bb5551f34b700e5
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 5 | ||||
-rw-r--r-- | src/network/access/qnetworkreplywasmimpl.cpp | 1 | ||||
-rw-r--r-- | src/network/ssl/qocspresponse.cpp | 8 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index 9df3d73dd7..f79a4d1dc6 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -967,7 +967,10 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket } else if (state != QHttpNetworkConnectionChannel::IdleState && state != QHttpNetworkConnectionChannel::ReadingState) { // Try to reconnect/resend before sending an error. // While "Reading" the _q_disconnected() will handle this. - if (reconnectAttempts-- > 0) { + // If we're using ssl then the protocolHandler is not initialized until + // "encrypted" has been emitted, since retrying requires the protocolHandler (asserted) + // we will not try if encryption is not done. + if (!pendingEncrypt && reconnectAttempts-- > 0) { resendCurrentRequest(); return; } else { diff --git a/src/network/access/qnetworkreplywasmimpl.cpp b/src/network/access/qnetworkreplywasmimpl.cpp index b1e9853a50..f347cc0479 100644 --- a/src/network/access/qnetworkreplywasmimpl.cpp +++ b/src/network/access/qnetworkreplywasmimpl.cpp @@ -235,6 +235,7 @@ void QNetworkReplyWasmImpl::close() void QNetworkReplyWasmImpl::abort() { Q_D(const QNetworkReplyWasmImpl); + setError( QNetworkReply::OperationCanceledError, "Operation canceled" ); d->doAbort(); close(); diff --git a/src/network/ssl/qocspresponse.cpp b/src/network/ssl/qocspresponse.cpp index 1f2de44859..d564e817ca 100644 --- a/src/network/ssl/qocspresponse.cpp +++ b/src/network/ssl/qocspresponse.cpp @@ -124,14 +124,14 @@ QOcspResponse::QOcspResponse() /*! \since 5.13 - Creates a new response, the copy of \a other. + Copy-constructs a QOcspResponse instance. */ QOcspResponse::QOcspResponse(const QOcspResponse &) = default; /*! \since 5.13 - Move-constructs a QOcspResponse instance from \a other. + Move-constructs a QOcspResponse instance. */ QOcspResponse::QOcspResponse(QOcspResponse &&) Q_DECL_NOTHROW = default; @@ -145,14 +145,14 @@ QOcspResponse::~QOcspResponse() = default; /*! \since 5.13 - Assigns \a other to the response and returns a reference to this response. + Copy-assigns and returns a reference to this response. */ QOcspResponse &QOcspResponse::operator=(const QOcspResponse &) = default; /*! \since 5.13 - Move-assigns \a other to this QOcspResponse instance. + Move-assigns to this QOcspResponse instance. */ QOcspResponse &QOcspResponse::operator=(QOcspResponse &&) Q_DECL_NOTHROW = default; |