Changeset 651 for trunk/src/network/socket/qnativesocketengine.cpp

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/network/socket/qnativesocketengine.cpp (modified) (2 diffs)

trunk/src/network/socket/qnativesocketengine.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -779 +779 @@
         close();
         return -1;
+    } else if (readBytes == -1) {
+        d->setError(QAbstractSocket::NetworkError,
+                    QNativeSocketEnginePrivate::ReadErrorString);
+        close();
+        return -1;
     }
     return readBytes;