Make QUrl handle ambiguous delimiters correctly

Refactor the way that QUrl stores and returns the components of the
URL so that ambiguous delimiters (gen-delims that could change the
meaning of the parsing) are interpreted correctly. Previously, QUrl
called "unambiguous" the form found in a full URL, even though each
item in isolation could have more characters decoded.

Now, instead, store only the fully decoded form. To recreate the
compound forms (the full URL, as well as the user info and the
authority), we need to do more processing.

This commit applies to the user name, password, path and fragment
only. The scheme, host and port do not need this work because they are
special; the query is handled separately.

Change-Id: I5907ba9b8fe048fff23c128be95668c22820663a
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/corelib/io/qurl_p.h b/src/corelib/io/qurl_p.h
index e7b501c0b6..13abeddf9a 100644
--- a/src/corelib/io/qurl_p.h
+++ b/src/corelib/io/qurl_p.h
@@ -72,7 +72,8 @@ public:
         Path = 0x20,
         Hierarchy = Authority | Path,
         Query = 0x40,
-        Fragment = 0x80
+        Fragment = 0x80,
+        FullUrl = 0xff
     };
 
     enum ErrorCode {
@@ -112,12 +113,12 @@ public:
     { return sectionIsPresent == 0 && port == -1 && path.isEmpty(); }
 
     // no QString scheme() const;
-    void appendAuthority(QString &appendTo, QUrl::FormattingOptions options) const;
-    void appendUserInfo(QString &appendTo, QUrl::FormattingOptions options) const;
+    void appendAuthority(QString &appendTo, QUrl::FormattingOptions options, Section appendingTo) const;
+    void appendUserInfo(QString &appendTo, QUrl::FormattingOptions options, Section appendingTo) const;
     void appendUserName(QString &appendTo, QUrl::FormattingOptions options) const;
     void appendPassword(QString &appendTo, QUrl::FormattingOptions options) const;
     void appendHost(QString &appendTo, QUrl::FormattingOptions options) const;
-    void appendPath(QString &appendTo, QUrl::FormattingOptions options) const;
+    void appendPath(QString &appendTo, QUrl::FormattingOptions options, Section appendingTo) const;
     void appendQuery(QString &appendTo, QUrl::FormattingOptions options) const;
     void appendFragment(QString &appendTo, QUrl::FormattingOptions options) const;