diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-26 21:49:41 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-26 21:49:42 +0200 |
commit | d013eb055c31cec9bc29126939be109e0ac1aad5 (patch) | |
tree | 352ae70aa5ecebd665bd6b36d68348f31cd5781e /src/network | |
parent | 9fabb548daed933a54d24871eade9f60f9c2ae55 (diff) | |
parent | 78f9f4b4970e6f4155b7cf2e88c6ac540dec47bc (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ic5a232260a6c8ee71f9ff91e820f54c36ab6b15a
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index 5c537691e2..e14f426583 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -1116,6 +1116,9 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket errorCode = QNetworkReply::RemoteHostClosedError; } } else if (state == QHttpNetworkConnectionChannel::ReadingState) { + if (!reply) + break; + if (!reply->d_func()->expectContent()) { // No content expected, this is a valid way to have the connection closed by the server return; |