summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-08-18 16:52:45 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-08-20 10:36:50 (GMT)
commitc7c7b364d9816d03c7475d6592d50dec5401c151 (patch)
treef24fcc1bca4108b990fdce9eb856b2e00c2a8b93 /tests/auto
parent909cdf082fd99ce8bdcb99a9db38d09f52d869aa (diff)
downloadQt-c7c7b364d9816d03c7475d6592d50dec5401c151.zip
Qt-c7c7b364d9816d03c7475d6592d50dec5401c151.tar.gz
Qt-c7c7b364d9816d03c7475d6592d50dec5401c151.tar.bz2
Fix literal IPv6 hostname resolution in QHostInfo.
With the series of commits ending in ff1280178, I made QUrl::toAce fail if the parameter is not a well-formed hostname (i.e., if it violates STD3). IPv6 hostnames do, so we can't preemptively run ToACE. Instead, delay running ToACE until we've tried literal matching. Reviewed-by: TrustMe
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qhostinfo/tst_qhostinfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp
index 4b60aca..abe49df 100644
--- a/tests/auto/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp
@@ -303,7 +303,7 @@ void tst_QHostInfo::reverseLookup_data()
// ### Use internal DNS instead. Discussed with Andreas.
//QTest::newRow("classical.hexago.com") << QString("2001:5c0:0:2::24") << QStringList(QString("classical.hexago.com")) << 0;
QTest::newRow("www.cisco.com") << QString("198.133.219.25") << QStringList(QString("origin-www.cisco.com")) << 0;
- QTest::newRow("bogusexample.doenstexist.org") << QString("1::2::3::4") << QStringList() << 1;
+ QTest::newRow("bogus-name") << QString("1::2::3::4") << QStringList() << 1;
}
void tst_QHostInfo::reverseLookup()