From a91a9d014adaeaa58640641579e30b5ff2383e99 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Tue, 7 Sep 2010 17:52:44 +0200
Subject: Fix handling of braces/no-braces in QUrl::host / setHost.

The hostname is supposed to be stored in canonical form, with the
braces. However, if you call url.setHost("::1"), then a non-canonical
hostname is stored. So make the canonicalisation function correct this.

Task-number: QTBUG-13464
Reviewed-by: Markus Goetz
---
 src/corelib/io/qurl.cpp      | 4 ++++
 tests/auto/qurl/tst_qurl.cpp | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 56a03c9..74c24b5 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -3399,16 +3399,20 @@ QString QUrlPrivate::canonicalHost() const
     if (host.contains(QLatin1Char(':'))) {
         // This is an IP Literal, use _IPLiteral to validate
         QByteArray ba = host.toLatin1();
+        bool needsBraces = false;
         if (!ba.startsWith('[')) {
             // surround the IP Literal with [ ] if it's not already done so
             ba.reserve(ba.length() + 2);
             ba.prepend('[');
             ba.append(']');
+            needsBraces = true;
         }
 
         const char *ptr = ba.constData();
         if (!_IPLiteral(&ptr))
             that->host.clear();
+        else if (needsBraces)
+            that->host = QString::fromLatin1(ba.toLower());
         else
             that->host = host.toLower();
     } else {
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp
index 370bd13..b5236e5 100644
--- a/tests/auto/qurl/tst_qurl.cpp
+++ b/tests/auto/qurl/tst_qurl.cpp
@@ -2266,7 +2266,9 @@ void tst_QUrl::ipv6()
 
     QCOMPARE(url.isValid(), isValid);
     if (url.isValid()) {
-	QCOMPARE(url.toString(), ipv6Auth);
+        QCOMPARE(url.toString(), ipv6Auth);
+        url.setHost(url.host());
+        QCOMPARE(url.toString(), ipv6Auth);
     }
 };
 
@@ -2290,6 +2292,8 @@ void tst_QUrl::ipv6_2()
 
     QUrl url(input);
     QCOMPARE(url.toString(), output);
+    url.setHost(url.host());
+    QCOMPARE(url.toString(), output);
 }
 
 void tst_QUrl::moreIpv6()
-- 
cgit v0.12