diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-07-31 15:19:30 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-01 13:04:21 +0200 |
commit | 0838ac541d38b33b23955c036bbcfd94ccc19066 (patch) | |
tree | 8aec778ef4bc36a75247a84f3ee9ba498a13e875 /src/corelib/io/qurl_p.h | |
parent | e1038794b1d7fe298535960eb90d5c823aa3f2c4 (diff) |
Make sure that the parsing mode reaches QUrlPrivate::setHost
Ensure that the parsing mode is cascaded down from setAuthority and
setUrl so that the hostname parsing does not attempt to decode
percent-encoded hostnames when it shouldn't.
Take the opportunity to also remove the "Boolean Trap" from
QUrlPrivate::setHost.
Change-Id: Ia64754c4a4900182700b7af1382aea8410abc7e9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/io/qurl_p.h')
-rw-r--r-- | src/corelib/io/qurl_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qurl_p.h b/src/corelib/io/qurl_p.h index 95ccd221a2..a1efb29ff8 100644 --- a/src/corelib/io/qurl_p.h +++ b/src/corelib/io/qurl_p.h @@ -123,11 +123,11 @@ public: // the "end" parameters are like STL iterators: they point to one past the last valid element bool setScheme(const QString &value, int len); - bool setAuthority(const QString &auth, int from, int end); + bool setAuthority(const QString &auth, int from, int end, QUrl::ParsingMode mode); void setUserInfo(const QString &userInfo, int from, int end); void setUserName(const QString &value, int from, int end); void setPassword(const QString &value, int from, int end); - bool setHost(const QString &value, int from, int end, bool maybePercentEncoded = true); + bool setHost(const QString &value, int from, int end, QUrl::ParsingMode mode); void setPath(const QString &value, int from, int end); void setQuery(const QString &value, int from, int end); void setFragment(const QString &value, int from, int end); |