File qt5-correctly-handle-connection-closed.patch of Package mingw32-libqt5-qtbase

Overview Repositories Revisions Requests Users Attributes Meta

File qt5-correctly-handle-connection-closed.patch of Package mingw32-libqt5-qtbase (Revision c4c3224aa513a96e0e5cb66c90e38326)

Currently displaying revision c4c3224aa513a96e0e5cb66c90e38326 , Show latest

diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 49c6793..ee95157 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -688,6 +688,11 @@ void QHttpNetworkConnectionChannel::_q_bytesWritten(qint64 bytes)
 
 void QHttpNetworkConnectionChannel::_q_disconnected()
 {
+    if (socket && socket->state() != QAbstractSocket::UnconnectedState) {
+        // This is because it's a QueuedConnection and might already be reconnecting
+        qDebug() << "Disconnected signal while unconnected, ignoring";
+        return;
+    }
     if (state == QHttpNetworkConnectionChannel::ClosingState) {
         state = QHttpNetworkConnectionChannel::IdleState;
         QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
@@ -791,7 +796,17 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
     case QAbstractSocket::RemoteHostClosedError:
         // try to reconnect/resend before sending an error.
         // while "Reading" the _q_disconnected() will handle this.
-        if (state != QHttpNetworkConnectionChannel::IdleState && state != QHttpNetworkConnectionChannel::ReadingState) {
+        if (!reply && state == QHttpNetworkConnectionChannel::IdleState) {
+            qDebug() << Q_FUNC_INFO << "Server closed connection, ignore error";
+            // This is a perfectly fine thing to happen by "Connection: close" webservers, just retry.
+            // the check for bytesTotal is so that we only do this for sockets where there had been ever a request.
+            // (if there was none, we need the other code path that emits an error.)
+            close();
+            QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+            return;
+        } else if (state != QHttpNetworkConnectionChannel::IdleState && state != QHttpNetworkConnectionChannel::ReadingState) {
+            qDebug() << Q_FUNC_INFO << "Resend request" << reconnectAttempts;
+
             if (reconnectAttempts-- > 0) {
                 closeAndResendCurrentRequest();
                 return;
@@ -814,9 +829,12 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
             // ok, we got a disconnect even though we did not expect it
             // Try to read everything from the socket before we emit the error.
             if (socket->bytesAvailable()) {
+                qDebug() << Q_FUNC_INFO << "Bytes available after _q_error, will read them.";
+
                 // Read everything from the socket into the reply buffer.
                 // we can ignore the readbuffersize as the data is already
                 // in memory and we will not receive more data on the socket.
+                reply->setDownstreamLimited(false);
                 reply->setReadBufferSize(0);
                 _q_receiveReply();
 #ifndef QT_NO_SSL
@@ -836,8 +854,14 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
                     }
                 }
 #endif
+                if (!reply) {
+                    // There is no more reply, this means the above code finished the reply and we can ignore this "error"
+                    QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+                    qDebug() << "No more reply after processing data, ignoring error";
+                    close();
+                    return;
+                }
             }
-
             errorCode = QNetworkReply::RemoteHostClosedError;
         } else {
             errorCode = QNetworkReply::RemoteHostClosedError;
@@ -889,8 +913,11 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
     // emit error for all waiting replies
     do {
         // Need to dequeu the request so that we can emit the error.
-        if (!reply)
+        if (!reply) {
             connection->d_func()->dequeueRequest(socket);
+            if (reply)
+                qDebug() << Q_FUNC_INFO << "Also erroring other QHttpNetworkReply" << reply << reply->request().url();
+        }
 
         if (reply) {
             reply->d_func()->errorString = errorString;
diff --git a/src/network/access/qhttpprotocolhandler.cpp b/src/network/access/qhttpprotocolhandler.cpp
index 3357948..5bd7539 100644
--- a/src/network/access/qhttpprotocolhandler.cpp
+++ b/src/network/access/qhttpprotocolhandler.cpp
@@ -68,6 +68,13 @@ void QHttpProtocolHandler::_q_receiveReply()
 
     // connection might be closed to signal the end of data
     if (socketState == QAbstractSocket::UnconnectedState) {
+#ifndef QT_NO_SSL
+        QSslSocket *sslSocket = qobject_cast<QSslSocket*>(m_socket);
+        if (sslSocket && sslSocket->encryptedBytesAvailable() > 0) {
+            // Make sure data gets decrypted and is then available here.
+            sslSocket->flush();
+        }
+#endif
         if (m_socket->bytesAvailable() <= 0) {
             if (m_reply->d_func()->state == QHttpNetworkReplyPrivate::ReadingDataState) {
                 // finish this reply. this case happens when the server did not send a content length

Places

File qt5-correctly-handle-connection-closed.patch of Package mingw32-libqt5-qtbase (Revision c4c3224aa513a96e0e5cb66c90e38326)

Places