diff options
| author | Peter Hartmann <phartmann@rim.com> | 2013-02-06 15:26:22 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-02 10:13:27 +0100 |
| commit | b20d15b58b83e76144dbeac4dc9b83215cc91f6a (patch) | |
| tree | 4487dd66524756d2cf68cf1cc98a4348a9ae231f /src/corelib/io/qurlidna.cpp | |
| parent | 658616b44e8d6ff860ab2f58ff6e51f89c212f95 (diff) | |
QUrl: update top level domains that may contain non-ASCII characters
Most notably, .com and .net now may contain non-ASCII characters.
list has been generated from
http://www.mozilla.org/projects/security/tld-idn-policy-list.html
Change-Id: Idc3191dc782bc4173ccb19b4bc81f4f061ca7999
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qurlidna.cpp')
| -rw-r--r-- | src/corelib/io/qurlidna.cpp | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/src/corelib/io/qurlidna.cpp b/src/corelib/io/qurlidna.cpp index e2cd481035..fac1703da8 100644 --- a/src/corelib/io/qurlidna.cpp +++ b/src/corelib/io/qurlidna.cpp @@ -2336,27 +2336,42 @@ Q_AUTOTEST_EXPORT QString qt_punycodeDecoder(const QString &pc) } static const char * const idn_whitelist[] = { - "ac", "ar", "at", + "ac", "ar", "asia", "at", "biz", "br", - "cat", "ch", "cl", "cn", + "cat", "ch", "cl", "cn", "com", "de", "dk", "es", "fi", "gr", "hu", - "info", "io", "is", + "il", "info", "io", "is", "ir", "jp", "kr", - "li", "lt", + "li", "lt", "lu", "lv", "museum", - "no", + "name", "net", "no", "nu", "nz", "org", + "pl", "pr", "se", "sh", - "th", "tm", "tw", + "tel", "th", "tm", "tw", + "ua", "vn", + "xn--fiqs8s", // China + "xn--fiqz9s", // China + "xn--fzc2c9e2c", // Sri Lanka + "xn--j6w193g", // Hong Kong + "xn--kprw13d", // Taiwan + "xn--kpry57d", // Taiwan + "xn--mgba3a4f16a", // Iran + "xn--mgba3a4fra", // Iran "xn--mgbaam7a8h", // UAE + "xn--mgbayh7gpa", // Jordan "xn--mgberp4a5d4ar", // Saudi Arabia - "xn--wgbh1c" // Egypt + "xn--ogbpf8fl", // Syria + "xn--p1ai", // Russian Federation + "xn--wgbh1c", // Egypt + "xn--wgbl6a", // Qatar + "xn--xkc2al3hye2a" // Sri Lanka }; static const size_t idn_whitelist_size = sizeof idn_whitelist / sizeof *idn_whitelist; |