summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/download/download_manager.cc3
-rw-r--r--chrome/browser/download/download_manager_unittest.cc8
2 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index 8d65eba..3b68cfa 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -1294,6 +1294,9 @@ static const char* kExecutableWhiteList[] = {
// JavaScript is just as powerful as EXE.
"text/javascript",
"text/javascript;version=*",
+ // Registry files can cause critical changes to the MS OS behavior.
+ // Addition of this mimetype also addresses bug 7337.
+ "text/x-registry",
// Some sites use binary/octet-stream to mean application/octet-stream.
// See http://code.google.com/p/chromium/issues/detail?id=1573
"binary/octet-stream"
diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc
index d3b1506..f1fea31 100644
--- a/chrome/browser/download/download_manager_unittest.cc
+++ b/chrome/browser/download/download_manager_unittest.cc
@@ -313,12 +313,18 @@ const struct {
"image/jpeg",
L"download.jpg"},
- // For bug 5772
+ // Issue=5772.
{"",
"http://www.example.com/foo.tar.gz",
"application/x-tar",
L"foo.tar.gz"},
+ // Issue=7337.
+ {"",
+ "http://maged.lordaeron.org/blank.reg",
+ "text/x-registry",
+ L"blank.reg"},
+
{"",
"http://www.example.com/bar.tar",
"application/x-tar",