diff options
author | Shane Kearns <shane.kearns@accenture.com> | 2011-10-24 11:07:02 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-24 13:56:41 +0200 |
commit | cea8e41dc838bcdc2ec63eefac6441ddc608e390 (patch) | |
tree | bff8f2a1d109b762784ba003941e0ae0d9e84d08 /src/network/access | |
parent | 3736dcb65e92ea3d6f1af827a52b09ebd1250f7e (diff) |
Network - Use isLoopback API in place of existing localhost checks
Various places in QtNetwork checked for Localhost or LocalHostIPv6,
i.e. 127.0.0.1 or ::1. By using the isLoopback API, other loopback
addresses are treated the same way (e.g. 127.0.0.2 and ::ffff:127.0.0.1)
Task-number: QTBUG-22246
Change-Id: I46f55630d8646fd68034a509969a0b7cb72ca77c
Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com>
Diffstat (limited to 'src/network/access')
-rw-r--r-- | src/network/access/qnetworkaccessbackend.cpp | 3 | ||||
-rw-r--r-- | src/network/access/qnetworkreplyhttpimpl.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp index e8483a9029..8dfcb33282 100644 --- a/src/network/access/qnetworkaccessbackend.cpp +++ b/src/network/access/qnetworkaccessbackend.cpp @@ -372,8 +372,7 @@ bool QNetworkAccessBackend::start() const QString host = reply->url.host(); if (host == QLatin1String("localhost") || - QHostAddress(host) == QHostAddress::LocalHost || - QHostAddress(host) == QHostAddress::LocalHostIPv6) { + QHostAddress(host).isLoopback()) { // Don't need an open session for localhost access. } else { // need to wait for session to be opened diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index 52cbaae5e0..2df18b24d9 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -1504,8 +1504,7 @@ bool QNetworkReplyHttpImplPrivate::start() // This is not ideal. const QString host = url.host(); if (host == QLatin1String("localhost") || - QHostAddress(host) == QHostAddress::LocalHost || - QHostAddress(host) == QHostAddress::LocalHostIPv6) { + QHostAddress(host).isLoopback()) { // Don't need an open session for localhost access. postRequest(); return true; |