summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-05-08 16:38:54 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-05-08 16:39:41 (GMT)
commit79533291672fd5e6ddafe5be90501cbe2ec97b1b (patch)
treec2080488c9b9e609c0d7b3e57c2e6a35d73cf80a
parent4d0c9cfe654c82f99249142f5a51c2b8dd38d80b (diff)
downloadQt-79533291672fd5e6ddafe5be90501cbe2ec97b1b.zip
Qt-79533291672fd5e6ddafe5be90501cbe2ec97b1b.tar.gz
Qt-79533291672fd5e6ddafe5be90501cbe2ec97b1b.tar.bz2
QUrl: update the whitelist of IDN domains
The list is taken from the Mozilla page.
-rw-r--r--src/corelib/io/qurl.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index ffe8d06..3604648 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -3129,10 +3129,11 @@ static void toPunycodeHelper(const QChar *s, int ucLength, QString *output)
static const char * const idn_whitelist[] = {
- "ac", "at",
- "br",
+ "ac", "ar", "at",
+ "biz", "br",
"cat", "ch", "cl", "cn",
"de", "dk",
+ "es",
"fi",
"gr",
"hu",
@@ -3146,6 +3147,9 @@ static const char * const idn_whitelist[] = {
"se", "sh",
"th", "tm", "tw",
"vn",
+ "xn--mgbaam7a8h", // UAE
+ "xn--mgberp4a5d4ar", // Saudi Arabia
+ "xn--wgbh1c" // Egypt
};
static QStringList *user_idn_whitelist = 0;