diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-11 11:59:01 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-11 11:59:01 +0000 |
| commit | b31c3d727a5b041921f66adadbdd182a1e63a771 (patch) | |
| tree | d38dd200735c0b55358b6d078efa24d31875f6d0 | |
| parent | 1577c997d647b9835cb85d60b37a653b5a2f4088 (diff) | |
| download | chromium_src-b31c3d727a5b041921f66adadbdd182a1e63a771.zip chromium_src-b31c3d727a5b041921f66adadbdd182a1e63a771.tar.gz chromium_src-b31c3d727a5b041921f66adadbdd182a1e63a771.tar.bz2 | |
Increase URL blacklist size limit to 1000.
BUG=chromium-os:35207
TEST=None
R=joaodasilva@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11066116
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161333 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/policy/policy_templates.json | 4 | ||||
| -rw-r--r-- | chrome/browser/policy/url_blacklist_manager.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json index 954aaec..24d2d88 100644 --- a/chrome/app/policy/policy_templates.json +++ b/chrome/app/policy/policy_templates.json @@ -2554,7 +2554,7 @@ The optional port is a valid port number from 1 to 65535. If none is specified, all ports are blocked. If the optional path is specified, only paths with that prefix will be blocked. - Exceptions can be defined in the URL whitelist policy. These policies are limited to 100 entries; subsequent entries will be ignored. + Exceptions can be defined in the URL whitelist policy. These policies are limited to 1000 entries; subsequent entries will be ignored. If this policy is not set no URL will be blacklisted in the browser.''', }, @@ -2578,7 +2578,7 @@ The most specific filter will determine if a URL is blocked or allowed. The whitelist takes precedence over the blacklist. - This policy is limited to 100 entries; subsequent entries will be ignored. + This policy is limited to 1000 entries; subsequent entries will be ignored. If this policy is not set there will be no exceptions to the blacklist from the 'URLBlacklist' policy.''', }, diff --git a/chrome/browser/policy/url_blacklist_manager.cc b/chrome/browser/policy/url_blacklist_manager.cc index 9c7afb7..2235792 100644 --- a/chrome/browser/policy/url_blacklist_manager.cc +++ b/chrome/browser/policy/url_blacklist_manager.cc @@ -31,7 +31,7 @@ namespace policy { namespace { // Maximum filters per policy. Filters over this index are ignored. -const size_t kMaxFiltersPerPolicy = 100; +const size_t kMaxFiltersPerPolicy = 1000; const char* kStandardSchemes[] = { "http", |