summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
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-04-28 11:34:05 (GMT)
commita8065da96b96fcc4baeca7615c2a4195c05cbc03 (patch)
tree0bfbe0d5d37177bcb7c2ed6e1432a480d81168a2 /src/corelib/io
parent18480fd6cec52722d9d096991790e32837a7ebd8 (diff)
downloadQt-a8065da96b96fcc4baeca7615c2a4195c05cbc03.zip
Qt-a8065da96b96fcc4baeca7615c2a4195c05cbc03.tar.gz
Qt-a8065da96b96fcc4baeca7615c2a4195c05cbc03.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
Diffstat (limited to 'src/corelib/io')
-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 a60f206..4e580dd 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -2997,7 +2997,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;