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 /net/url_request | |
| 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 'net/url_request')
| -rw-r--r-- | net/url_request/url_request_ftp_job.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc index f619609..202d1fb 100644 --- a/net/url_request/url_request_ftp_job.cc +++ b/net/url_request/url_request_ftp_job.cc @@ -61,7 +61,7 @@ static bool UnescapeAndValidatePath(const URLRequest* request, // we need to identify the encoding and convert to that encoding. static const std::string kInvalidChars("\x00\x0d\x0a", 3); *unescaped_path = UnescapeURLComponent(request->url().path(), - UnescapeRule::SPACES | UnescapeRule::PERCENTS); + UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS); if (unescaped_path->find_first_of(kInvalidChars) != std::string::npos) { SetLastError(ERROR_INTERNET_INVALID_URL); // GURL path should not contain '%00' which is NULL(0x00) when unescaped. @@ -416,7 +416,7 @@ void URLRequestFtpJob::OnStartDirectoryTraversal() { // Unescape the URL path and pass the raw 8bit directly to the browser. string html = net_util::GetDirectoryListingHeader( UnescapeURLComponent(request_->url().path(), - UnescapeRule::SPACES | UnescapeRule::PERCENTS)); + UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS)); // If this isn't top level directory (i.e. the path isn't "/",) add a link to // the parent directory. |