1 files changed, 49 insertions, 50 deletions

diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 1c77d14b29..6110131484 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -561,7 +561,6 @@ QAbstractSocketPrivate::QAbstractSocketPrivate()
       isBuffered(false),
       connectTimer(0),
       disconnectTimer(0),
-      connectTimeElapsed(0),
       hostLookupId(-1),
       socketType(QAbstractSocket::UnknownSocketType),
       state(QAbstractSocket::UnconnectedState),
@@ -722,19 +721,9 @@ bool QAbstractSocketPrivate::canReadNotification()
         }
     }
 
-    // only emit readyRead() when not recursing, and only if there is data available
-    bool hasData = newBytes > 0
-#ifndef QT_NO_UDPSOCKET
-        || (!isBuffered && socketType != QAbstractSocket::TcpSocket && socketEngine && socketEngine->hasPendingDatagrams())
-#endif
-        || (!isBuffered && socketType == QAbstractSocket::TcpSocket && socketEngine)
-        ;
-
-    if (!emittedReadyRead && hasData) {
-        QScopedValueRollback<bool> r(emittedReadyRead);
-        emittedReadyRead = true;
-        emit q->readyRead();
-    }
+    // Only emit readyRead() if there is data available.
+    if (newBytes > 0 || !isBuffered)
+        emitReadyRead();
 
     // If we were closed as a result of the readyRead() signal,
     // return.
@@ -792,12 +781,12 @@ void QAbstractSocketPrivate::canCloseNotification()
             // then occur when we read from the socket again and fail
             // in canReadNotification or by the manually created
             // closeNotification below.
-            emit q->readyRead();
+            emitReadyRead();
 
             QMetaObject::invokeMethod(socketEngine, "closeNotification", Qt::QueuedConnection);
         }
     } else if (socketType == QAbstractSocket::TcpSocket && socketEngine) {
-        emit q->readyRead();
+        emitReadyRead();
     }
 }
 
@@ -809,28 +798,15 @@ void QAbstractSocketPrivate::canCloseNotification()
 */
 bool QAbstractSocketPrivate::canWriteNotification()
 {
-#if defined (Q_OS_WIN)
-    if (socketEngine && socketEngine->isWriteNotificationEnabled())
-        socketEngine->setWriteNotificationEnabled(false);
-#endif
-
 #if defined (QABSTRACTSOCKET_DEBUG)
     qDebug("QAbstractSocketPrivate::canWriteNotification() flushing");
 #endif
-    qint64 tmp = writeBuffer.size();
-    flush();
+    bool dataWasWritten = writeToSocket();
 
-    if (socketEngine) {
-#if defined (Q_OS_WIN)
-        if (!writeBuffer.isEmpty())
-            socketEngine->setWriteNotificationEnabled(true);
-#else
-        if (writeBuffer.isEmpty() && socketEngine->bytesToWrite() == 0)
-            socketEngine->setWriteNotificationEnabled(false);
-#endif
-    }
+    if (socketEngine && writeBuffer.isEmpty() && socketEngine->bytesToWrite() == 0)
+        socketEngine->setWriteNotificationEnabled(false);
 
-    return (writeBuffer.size() < tmp);
+    return dataWasWritten;
 }
 
 /*! \internal
@@ -852,21 +828,20 @@ void QAbstractSocketPrivate::connectionNotification()
 
 /*! \internal
 
-    Writes pending data in the write buffers to the socket. The
-    function writes as much as it can without blocking.
+    Writes one pending data block in the write buffer to the socket.
 
     It is usually invoked by canWriteNotification after one or more
     calls to write().
 
     Emits bytesWritten().
 */
-bool QAbstractSocketPrivate::flush()
+bool QAbstractSocketPrivate::writeToSocket()
 {
     Q_Q(QAbstractSocket);
     if (!socketEngine || !socketEngine->isValid() || (writeBuffer.isEmpty()
         && socketEngine->bytesToWrite() == 0)) {
 #if defined (QABSTRACTSOCKET_DEBUG)
-    qDebug("QAbstractSocketPrivate::flush() nothing to do: valid ? %s, writeBuffer.isEmpty() ? %s",
+    qDebug("QAbstractSocketPrivate::writeToSocket() nothing to do: valid ? %s, writeBuffer.isEmpty() ? %s",
            (socketEngine && socketEngine->isValid()) ? "yes" : "no", writeBuffer.isEmpty() ? "yes" : "no");
 #endif
 
@@ -884,7 +859,8 @@ bool QAbstractSocketPrivate::flush()
     qint64 written = socketEngine->write(ptr, nextSize);
     if (written < 0) {
 #if defined (QABSTRACTSOCKET_DEBUG)
-        qDebug() << "QAbstractSocketPrivate::flush() write error, aborting." << socketEngine->errorString();
+        qDebug() << "QAbstractSocketPrivate::writeToSocket() write error, aborting."
+                 << socketEngine->errorString();
 #endif
         setErrorAndEmit(socketEngine->error(), socketEngine->errorString());
         // an unexpected error so close the socket.
@@ -893,7 +869,7 @@ bool QAbstractSocketPrivate::flush()
     }
 
 #if defined (QABSTRACTSOCKET_DEBUG)
-    qDebug("QAbstractSocketPrivate::flush() %lld bytes written to the network",
+    qDebug("QAbstractSocketPrivate::writeToSocket() %lld bytes written to the network",
            written);
 #endif
 
@@ -914,7 +890,23 @@ bool QAbstractSocketPrivate::flush()
     if (state == QAbstractSocket::ClosingState)
         q->disconnectFromHost();
 
-    return true;
+    return written > 0;
+}
+
+/*! \internal
+
+    Writes pending data in the write buffers to the socket. The function
+    writes as much as it can without blocking. If any data was written,
+    this function returns true; otherwise false is returned.
+*/
+bool QAbstractSocketPrivate::flush()
+{
+    bool dataWasWritten = false;
+
+    while (!writeBuffer.isEmpty() && writeToSocket())
+        dataWasWritten = true;
+
+    return dataWasWritten;
 }
 
 #ifndef QT_NO_NETWORKPROXY
@@ -977,8 +969,6 @@ void QAbstractSocketPrivate::startConnectingByName(const QString &host)
     state = QAbstractSocket::ConnectingState;
     emit q->stateChanged(state);
 
-    connectTimeElapsed = 0;
-
     if (cachedSocketDescriptor != -1 || initSocketLayer(QAbstractSocket::UnknownNetworkLayerProtocol)) {
         if (socketEngine->connectToHostByName(host, port) ||
             socketEngine->state() == QAbstractSocket::ConnectingState) {
@@ -1061,9 +1051,6 @@ void QAbstractSocketPrivate::_q_startConnecting(const QHostInfo &hostInfo)
     // Report the successful host lookup
     emit q->hostFound();
 
-    // Reset the total time spent connecting.
-    connectTimeElapsed = 0;
-
     // The addresses returned by the lookup will be tested one after
     // another by _q_connectToNextAddress().
     _q_connectToNextAddress();
@@ -1248,10 +1235,7 @@ void QAbstractSocketPrivate::_q_forceDisconnect()
 */
 bool QAbstractSocketPrivate::readFromSocket()
 {
-#ifdef QABSTRACTSOCKET_DEBUG
     Q_Q(QAbstractSocket);
-#endif
-
     // Find how many bytes we can read from the socket layer.
     qint64 bytesToRead = socketEngine->bytesAvailable();
     if (bytesToRead == 0) {
@@ -1280,7 +1264,7 @@ bool QAbstractSocketPrivate::readFromSocket()
         buffer.chop(bytesToRead);
         return true;
     }
-    buffer.chop(bytesToRead - (readBytes < 0 ? qint64(0) : readBytes));
+    buffer.chop(bytesToRead - ((readBytes < 0 || !q->isReadable()) ? qint64(0) : readBytes));
 #if defined(QABSTRACTSOCKET_DEBUG)
     qDebug("QAbstractSocketPrivate::readFromSocket() got %lld bytes, buffer size = %lld",
            readBytes, buffer.size());
@@ -1301,6 +1285,21 @@ bool QAbstractSocketPrivate::readFromSocket()
 
 /*! \internal
 
+    Prevents from the recursive readyRead() emission.
+*/
+void QAbstractSocketPrivate::emitReadyRead()
+{
+    Q_Q(QAbstractSocket);
+    // Only emit readyRead() when not recursing.
+    if (!emittedReadyRead) {
+        QScopedValueRollback<bool> r(emittedReadyRead);
+        emittedReadyRead = true;
+        emit q->readyRead();
+    }
+}
+
+/*! \internal
+
     Sets up the internal state after the connection has succeeded.
 */
 void QAbstractSocketPrivate::fetchConnectionParameters()
@@ -2378,7 +2377,7 @@ bool QAbstractSocket::isSequential() const
  */
 bool QAbstractSocket::atEnd() const
 {
-    return QIODevice::atEnd() && (!isOpen() || d_func()->buffer.isEmpty());
+    return QIODevice::atEnd();
 }
 
 /*!