diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 21:24:39 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 21:24:39 +0000 |
| commit | 3432291b5b66e9bea09537c3bfbc4d80f27442a4 (patch) | |
| tree | 26b6a4c09bcebc35931e1f92abbfbacabea2fa13 /chrome/browser | |
| parent | 87351794d9614198c266f7380c38a7327eb50056 (diff) | |
| download | chromium_src-3432291b5b66e9bea09537c3bfbc4d80f27442a4.zip chromium_src-3432291b5b66e9bea09537c3bfbc4d80f27442a4.tar.gz chromium_src-3432291b5b66e9bea09537c3bfbc4d80f27442a4.tar.bz2 | |
Treat multiple extensions like .tar.gz as a single extension.
The logic is taken from firefox.
BUG=48346
TEST=unit tests; downloading the same .tar.gz file multiple times (see bug)
Review URL: http://codereview.chromium.org/3018011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53844 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/download/download_manager.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc index bda2f8e..b12db28 100644 --- a/chrome/browser/download/download_manager.cc +++ b/chrome/browser/download/download_manager.cc @@ -1138,7 +1138,7 @@ void DownloadManager::GenerateExtension( // an executable is hidden in a benign file extension; // E.g. my-cat.jpg becomes my-cat.jpg.js if content type is // application/x-javascript. - // 4. New extension is not ".tar" for .gz files. For misconfigured web + // 4. New extension is not ".tar" for .tar.gz files. For misconfigured web // servers, i.e. bug 5772. // 5. The original extension is not ".tgz" & the new extension is not "gz". FilePath::StringType append_extension; @@ -1149,7 +1149,7 @@ void DownloadManager::GenerateExtension( !(append_extension == FILE_PATH_LITERAL("gz") && extension == FILE_PATH_LITERAL("tgz")) && (append_extension != FILE_PATH_LITERAL("tar") || - extension != FILE_PATH_LITERAL("gz"))) { + extension != FILE_PATH_LITERAL("tar.gz"))) { extension += FILE_PATH_LITERAL("."); extension += append_extension; } |