summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-10 06:15:38 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-10 06:15:38 +0000
commit89ec0bc44ba3fec94e4c6d02366cfef72a5c8eb4 (patch)
treec9b58b77bd15cccb3747cc2512c013e4efecf60f
parentbf8e366ca8ae435e6666cf8b792d7c7adfaffeaf (diff)
downloadchromium_src-89ec0bc44ba3fec94e4c6d02366cfef72a5c8eb4.zip
chromium_src-89ec0bc44ba3fec94e4c6d02366cfef72a5c8eb4.tar.gz
chromium_src-89ec0bc44ba3fec94e4c6d02366cfef72a5c8eb4.tar.bz2
JRE6u26 sounds like it fixes some pretty nasty bugs:
http://www.oracle.com/technetwork/topics/security/javacpujune2011-313339.html BUG=85678 Review URL: http://codereview.chromium.org/7046039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88642 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/plugins/npapi/plugin_list.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc
index 24150c9..89089b4 100644
--- a/webkit/plugins/npapi/plugin_list.cc
+++ b/webkit/plugins/npapi/plugin_list.cc
@@ -93,7 +93,7 @@ static const VersionRangeDefinition kQuicktimeVersionRange[] = {
{ "", "", "7.6.9", true }
};
static const VersionRangeDefinition kJavaVersionRange[] = {
- { "0", "7", "6.0.240", true } // "240" is not a typo.
+ { "0", "7", "6.0.260", true } // "260" is not a typo.
};
// This is up to date with
// http://www.adobe.com/support/security/bulletins/apsb11-08.html
@@ -146,7 +146,7 @@ static const PluginGroupDefinition kGroupDefinitions[] = { };
#else // Most importantly, covers desktop Linux.
static const VersionRangeDefinition kJavaVersionRange[] = {
- { "0", "1.7", "1.6.0.24", true }
+ { "0", "1.7", "1.6.0.26", true }
};
static const VersionRangeDefinition kRedhatIcedTeaVersionRange[] = {