diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-05 07:58:39 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-05 07:58:39 +0000 |
| commit | 60ff8f919f6687ba7438e1e728a854801b63af76 (patch) | |
| tree | b157cdada385bc35487a291d04982d656ed7a47b /chrome/browser/download | |
| parent | 78ccd342636a7edd63535e2624e15addb031f95d (diff) | |
| download | chromium_src-60ff8f919f6687ba7438e1e728a854801b63af76.zip chromium_src-60ff8f919f6687ba7438e1e728a854801b63af76.tar.gz chromium_src-60ff8f919f6687ba7438e1e728a854801b63af76.tar.bz2 | |
We should let binary/octet-stream have an EXE extension to fix compat with digsby.com and ohloh.net
BUG=1573
R=darin
Review URL: http://codereview.chromium.org/13165
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6424 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download')
| -rw-r--r-- | chrome/browser/download/download_manager.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/download/download_manager_unittest.cc | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc index 6e46896..419bcfe 100644 --- a/chrome/browser/download/download_manager.cc +++ b/chrome/browser/download/download_manager.cc @@ -1179,6 +1179,10 @@ bool DownloadManager::IsExecutableMimeType(const std::string& mime_type) { return true; if (net::MatchesMimeType("text/javascript;version=*", mime_type)) return true; + // Some sites use binary/octet-stream to mean application/octet-stream. + // See http://code.google.com/p/chromium/issues/detail?id=1573 + if (net::MatchesMimeType("binary/octet-stream", mime_type)) + return true; // We don't consider other non-application types to be executable. if (!net::MatchesMimeType("application/*", mime_type)) diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc index abfc100..d7648b9 100644 --- a/chrome/browser/download/download_manager_unittest.cc +++ b/chrome/browser/download/download_manager_unittest.cc @@ -97,6 +97,11 @@ static const struct { "image/jpeg", L"evil.jpg"}, + {"filename=ok.exe", + L"http://www.goodguy.com/ok.exe", + "binary/octet-stream", + L"ok.exe"}, + {"filename=evil.exe.exe", L"http://www.goodguy.com/evil.exe.exe", "dance/party", |