summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2010-04-26 13:16:34 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-05-14 10:06:07 (GMT)
commite301c82693c33c0f96c6a756d15fe35a9d877443 (patch)
tree39bb324ad81c925e1a77f860f0ea766a74ca81fe /src
parent153da73cd575763c03e6e03aee5243b52dc126bd (diff)
downloadQt-e301c82693c33c0f96c6a756d15fe35a9d877443.zip
Qt-e301c82693c33c0f96c6a756d15fe35a9d877443.tar.gz
Qt-e301c82693c33c0f96c6a756d15fe35a9d877443.tar.bz2
QUrl: parsing of host name with an undercore.
This is not supposed to be allowed, but it work with other browsers Rask-number: QTBUG-7434 Reviewed-by: Thiago Reviewed-by: Markus Goetz (cherry picked from commit a8065da96b96fcc4baeca7615c2a4195c05cbc03)
Diffstat (limited to 'src')
-rw-r--r--src/corelib/io/qurl.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index bdb0cfd..eb1834c 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -2990,7 +2990,9 @@ bool qt_check_std3rules(const QChar *uc, int len)
// only LDH is present
if (c == '-' || (c >= '0' && c <= '9')
|| (c >= 'A' && c <= 'Z')
- || (c >= 'a' && c <= 'z'))
+ || (c >= 'a' && c <= 'z')
+ //underscore is not supposed to be allowed, but other browser accept it (QTBUG-7434)
+ || c == '_')
continue;
return false;