diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-17 14:15:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-17 14:43:26 +0100 |
| commit | e5ac4afbf954a3e1616ce8543d46ddc668d0374f (patch) | |
| tree | be6d97001edebd5cb74c64aaf0010f3cc76a7293 /src/network/socket | |
| parent | e3ed95dd44b95b6e9361b562807e711d7ce5a58b (diff) | |
| parent | 03c1a6ac717e3c5693653a5e294214056bda970e (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
mkspecs/features/mac/default_post.prf
mkspecs/features/uikit/default_post.prf
Change-Id: I2a6f783451f2ac9eb4c1a050f605435d2dacf218
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qnativesocketengine_winrt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/socket/qnativesocketengine_winrt.cpp b/src/network/socket/qnativesocketengine_winrt.cpp index 62bc8ca683..3daca38959 100644 --- a/src/network/socket/qnativesocketengine_winrt.cpp +++ b/src/network/socket/qnativesocketengine_winrt.cpp @@ -662,10 +662,10 @@ qint64 QNativeSocketEngine::read(char *data, qint64 maxlen) if (d->socketType != QAbstractSocket::TcpSocket) return -1; - QMutexLocker mutexLocker(&d->readMutex); // There will be a read notification when the socket was closed by the remote host. If that // happens and there isn't anything left in the buffer, we have to return -1 in order to signal // the closing of the socket. + QMutexLocker mutexLocker(&d->readMutex); if (d->readBytes.pos() == d->readBytes.size() && d->socketState != QAbstractSocket::ConnectedState) { close(); return -1; @@ -718,7 +718,7 @@ qint64 QNativeSocketEngine::readDatagram(char *data, qint64 maxlen, QIpPacketHea QByteArray readOrigin; // Do not read the whole datagram. Put the rest of it back into the "queue" if (maxlen < datagram.data.length()) { - QByteArray readOrigin = datagram.data.left(maxlen); + readOrigin = datagram.data.left(maxlen); datagram.data = datagram.data.remove(0, maxlen); d->pendingDatagrams.prepend(datagram); } else { |