AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QUrl: Always lowercase the scheme

Browse Source 
Change-Id: I8d467014d22384f1be15fdd746e20b1153a82a4e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Thiago Macieira 2011-10-19 20:31:46 +02:00 committed by Qt by Nokia
parent 1372d60bde
commit 2591545ee1
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/corelib/io/qurl.cpp
View File

@ -514,6 +514,7 @@ bool QUrlPrivate::setScheme(const QString &value, int len, bool decoded)
// scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." ) // scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
// but we need to decode any percent-encoding sequences that fall on // but we need to decode any percent-encoding sequences that fall on
// those characters // those characters
// we also lowercase the scheme
scheme.clear(); scheme.clear();
sectionIsPresent |= Scheme; sectionIsPresent |= Scheme;
@ -522,12 +523,15 @@ bool QUrlPrivate::setScheme(const QString &value, int len, bool decoded)
return false; return false;
// validate it: // validate it:
int needsLowercasing = -1;
const ushort *p = reinterpret_cast<const ushort *>(value.constData()); const ushort *p = reinterpret_cast<const ushort *>(value.constData());
for (int i = 0; i < len; ++i) { for (int i = 0; i < len; ++i) {
if (p[i] >= 'a' && p[i] <= 'z') if (p[i] >= 'a' && p[i] <= 'z')
continue; continue;
if (p[i] >= 'A' && p[i] <= 'Z') if (p[i] >= 'A' && p[i] <= 'Z') {
needsLowercasing = i;
continue; continue;
}
if (p[i] >= '0' && p[i] <= '9' && i > 0) if (p[i] >= '0' && p[i] <= '9' && i > 0)
continue; continue;
if (p[i] == '+' || p[i] == '-' || p[i] == '.') if (p[i] == '+' || p[i] == '-' || p[i] == '.')
@ -551,6 +555,16 @@ bool QUrlPrivate::setScheme(const QString &value, int len, bool decoded)
scheme = value.left(len); scheme = value.left(len);
sectionHasError &= ~Scheme; sectionHasError &= ~Scheme;
if (needsLowercasing != -1) {
// schemes are ASCII only, so we don't need the full Unicode toLower
QChar *schemeData = scheme.data(); // force detaching here
for (int i = needsLowercasing; i >= 0; --i) {
register ushort c = schemeData[i].unicode();
if (c >= 'A' && c <= 'Z')
schemeData[i] = c + 0x20;
}
}
return true; return true;
} }
@ -2308,7 +2322,7 @@ bool QUrl::isLocalFile() const
{ {
if (!d) return false; if (!d) return false;
if (d->scheme.compare(fileScheme(), Qt::CaseInsensitive) != 0) if (d->scheme != fileScheme())
return false; // not file return false; // not file
return true; return true;
} }

20
tests/auto/corelib/io/qurl/tst_qurl.cpp
View File

@ -155,6 +155,7 @@ private slots:
void toEncodedNotUsingUninitializedPath(); void toEncodedNotUsingUninitializedPath();
void emptyAuthorityRemovesExistingAuthority(); void emptyAuthorityRemovesExistingAuthority();
void acceptEmptyAuthoritySegments(); void acceptEmptyAuthoritySegments();
void lowercasesScheme();
}; };
// Testing get/set functions // Testing get/set functions
@ -320,9 +321,9 @@ void tst_QUrl::setUrl()
} }
{ {
QUrl url("hTTp://www.foo.bar:80"); QUrl url("http://www.foo.bar:80");
QVERIFY(url.isValid()); QVERIFY(url.isValid());
QCOMPARE(url.scheme(), QString::fromLatin1("hTTp")); QCOMPARE(url.scheme(), QString::fromLatin1("http"));
QCOMPARE(url.path(), QString()); QCOMPARE(url.path(), QString());
QVERIFY(url.encodedQuery().isEmpty()); QVERIFY(url.encodedQuery().isEmpty());
QVERIFY(url.userInfo().isEmpty()); QVERIFY(url.userInfo().isEmpty());
@ -330,12 +331,12 @@ void tst_QUrl::setUrl()
QCOMPARE(url.host(), QString::fromLatin1("www.foo.bar")); QCOMPARE(url.host(), QString::fromLatin1("www.foo.bar"));
QCOMPARE(url.authority(), QString::fromLatin1("www.foo.bar:80")); QCOMPARE(url.authority(), QString::fromLatin1("www.foo.bar:80"));
QCOMPARE(url.port(), 80); QCOMPARE(url.port(), 80);
QCOMPARE(url.toString(), QString::fromLatin1("hTTp://www.foo.bar:80")); QCOMPARE(url.toString(), QString::fromLatin1("http://www.foo.bar:80"));
QCOMPARE(url.toDisplayString(), QString::fromLatin1("hTTp://www.foo.bar:80")); QCOMPARE(url.toDisplayString(), QString::fromLatin1("http://www.foo.bar:80"));
QCOMPARE(url.toDisplayString(QUrl::PreferLocalFile), QString::fromLatin1("hTTp://www.foo.bar:80")); QCOMPARE(url.toDisplayString(QUrl::PreferLocalFile), QString::fromLatin1("http://www.foo.bar:80"));
QUrl url2("//www1.foo.bar"); QUrl url2("//www1.foo.bar");
QCOMPARE(url.resolved(url2).toString(), QString::fromLatin1("hTTp://www1.foo.bar")); QCOMPARE(url.resolved(url2).toString(), QString::fromLatin1("http://www1.foo.bar"));
} }
{ {
@ -2481,5 +2482,12 @@ void tst_QUrl::effectiveTLDs()
QCOMPARE(domain.topLevelDomain(), TLD); QCOMPARE(domain.topLevelDomain(), TLD);
} }
void tst_QUrl::lowercasesScheme()
{
QUrl url;
url.setScheme("HELLO");
QCOMPARE(url.scheme(), QString("hello"));
}
QTEST_MAIN(tst_QUrl) QTEST_MAIN(tst_QUrl)
#include "tst_qurl.moc" #include "tst_qurl.moc"