diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-05 15:48:06 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-05 15:48:06 +0000 |
| commit | fb2ab08257345bff2d48e74f1d5e96faf2f8b493 (patch) | |
| tree | a400ca4cffdb09e19c62489848226c7740819c3a /net/base/net_util.cc | |
| parent | a4adab68d36edfecd5c27bc06084b305a5ea6200 (diff) | |
| download | chromium_src-fb2ab08257345bff2d48e74f1d5e96faf2f8b493.zip chromium_src-fb2ab08257345bff2d48e74f1d5e96faf2f8b493.tar.gz chromium_src-fb2ab08257345bff2d48e74f1d5e96faf2f8b493.tar.bz2 | |
Pull latest googleurl to get it to stop unescaping at signs in paths.
This also fixes the URL displayer to stop unescaping at signs. Otherwise, we'll have the weird situation where if you go to a site with a %40 in it where it cares about the difference between %40 and @, pressing enter in the URL bar will load the "@" variant and the URL won't load.
BUG=http:///crbug.com/23933
TEST=included unit test
Review URL: http://codereview.chromium.org/1614001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/net_util.cc')
| -rw-r--r-- | net/base/net_util.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/base/net_util.cc b/net/base/net_util.cc index aa2cb1b..b78b525 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -1278,7 +1278,8 @@ std::string GetHostName() { void GetIdentityFromURL(const GURL& url, std::wstring* username, std::wstring* password) { - UnescapeRule::Type flags = UnescapeRule::SPACES; + UnescapeRule::Type flags = + UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS; *username = UTF16ToWideHack(UnescapeAndDecodeUTF8URLComponent(url.username(), flags, NULL)); *password = UTF16ToWideHack(UnescapeAndDecodeUTF8URLComponent(url.password(), |