diff options
author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-29 16:36:36 +0000 |
---|---|---|
committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-29 16:36:36 +0000 |
commit | a9c217fc61aaa2aff80877836264528cf9870ae8 (patch) | |
tree | 09485ea0a3134b2efbfce170f73b063447ed473a /chrome | |
parent | 4e1fd027999bf8148458d5c14ac6345d79227cfd (diff) | |
download | chromium_src-a9c217fc61aaa2aff80877836264528cf9870ae8.zip chromium_src-a9c217fc61aaa2aff80877836264528cf9870ae8.tar.gz chromium_src-a9c217fc61aaa2aff80877836264528cf9870ae8.tar.bz2 |
Puts back the optional unescaping of control characters and URL parse-affecting characters. That patch was reverted due to build problems.
This is heavily modified from the original patch. That patch required an additional function and a bunch of internal boolean flags. This one uses the new flags enum I wrote to add this to the existing functionality more cleanly.
BUG=1271340
BUG=1258819
Review URL: http://chrome-reviews.prom.corp.google.com/804
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/url_fixer_upper.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/url_fixer_upper.cc b/chrome/browser/url_fixer_upper.cc index 920e70c..9fb2cde 100644 --- a/chrome/browser/url_fixer_upper.cc +++ b/chrome/browser/url_fixer_upper.cc @@ -446,7 +446,8 @@ wstring URLFixerUpper::FixupRelativeFile(const wstring& base_dir, // escaped things. We need to go through 8-bit since the escaped values // only represent 8-bit values. std::wstring unescaped = UTF8ToWide(UnescapeURLComponent( - WideToUTF8(trimmed), UnescapeRule::SPACES | UnescapeRule::PERCENTS)); + WideToUTF8(trimmed), + UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS)); if (!ValidPathForFile(unescaped, &full_path)) is_file = false; } |