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/socket/qabstractsocket.cpp | |
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/socket/qabstractsocket.cpp')
-rw-r--r-- | src/network/socket/qabstractsocket.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index b662a75259..e5bb72f36a 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -802,8 +802,7 @@ void QAbstractSocketPrivate::resolveProxy(const QString &hostname, quint16 port) if (hostname == QLatin1String("localhost") || hostname.startsWith(QLatin1String("localhost.")) || (parsed.setAddress(hostname) - && (parsed == QHostAddress::LocalHost - || parsed == QHostAddress::LocalHostIPv6))) { + && (parsed.isLoopback()))) { proxyInUse = QNetworkProxy::NoProxy; return; } |