diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-10-17 19:24:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-21 17:35:00 +0200 |
| commit | 690cf426f3a8c18d903e61228f65fa3b9e2a69d3 (patch) | |
| tree | 42c3afb155a145ec2f01a20ae87446e9496da673 /src/network/access/qhttpnetworkconnection_p.h | |
| parent | 13035f7fd648c3c4217620695aae033dfbf37b8a (diff) | |
Fix Q_ASSERT(!channels[0].isSocketBusy());v5.2.0-beta1
Since commit f30641a7 is has been possible to issue more than one host
lookup request per HttpNetworkConnection. If the result was both an
IPv4 and IPv6 address, and we get a second similar DNS reply, we
end up triggering the assert in startNetworkLayerStateLookup().
This patch splits the InProgress state to HostLookupPending and the state
of trying both IPv4 and IPv6. This makes it possible to ignore any new DNS
replies received after the first succesfull one.
Change-Id: I0b8d6b1582fdaed69dde5926019b60bb0cbd580d
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Diffstat (limited to 'src/network/access/qhttpnetworkconnection_p.h')
| -rw-r--r-- | src/network/access/qhttpnetworkconnection_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index c54250f6ed..2aaaad24ac 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -165,9 +165,10 @@ public: enum NetworkLayerPreferenceState { Unknown, - InProgress, + HostLookupPending, IPv4, - IPv6 + IPv6, + IPv4or6 }; QHttpNetworkConnectionPrivate(const QString &hostName, quint16 port, bool encrypt); |