Author: Peter Eckersley <[email protected]> Date: Wed, 13 Oct 2010 12:42:10 -0700 Subject: Turn the Amazon rule off by default Commit: 2a8364eb5a0c9175b60f37358f6eee0c6a5cdecd
(This required that the rule be renamed, so that it gets a fresh about:config rule. We probably need some code to delete about:config entries for rules that are no longer present) --- src/chrome/content/rules/Amazon-off-by-default.xml | 22 ++++++++++++++++++++ src/chrome/content/rules/Amazon.xml | 19 ----------------- 2 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 src/chrome/content/rules/Amazon-off-by-default.xml delete mode 100644 src/chrome/content/rules/Amazon.xml diff --git a/src/chrome/content/rules/Amazon-off-by-default.xml b/src/chrome/content/rules/Amazon-off-by-default.xml new file mode 100644 index 0000000..567bcbb --- /dev/null +++ b/src/chrome/content/rules/Amazon-off-by-default.xml @@ -0,0 +1,22 @@ +<ruleset name="Amazon (buggy)" default_off="yes; any string turns the rule off"> + +<!-- This rule is off by default because it causes so many aspects of the + Amazon site to break; see the mailing list archives for details --> + +<!-- Amazon appears to operate in 7 countries, and does not hold the domains + for some others, like .se or .be. In other cases there is an http-only site + that redirects to one of these 7 countries. --> + + <!-- We totally need to figure out if we can have a blanket redirect + for Amazon Web Services, which are a very popular CDN that appears + to support HTTPS! --> + + <rule from="^http://(www\.)?amazon\.com/" to="https://www.amazon.com/"; /> + + <rule from="^http://(www\.)?amazon\.co\.(uk|jp)/" + to="https://www.amazon.co.$2/"; /> + + <rule from="^http://(www\.)?amazon\.(ca|cn|de|fr)/" + to="https://www.amazon.$2/"; /> + +</ruleset> diff --git a/src/chrome/content/rules/Amazon.xml b/src/chrome/content/rules/Amazon.xml deleted file mode 100644 index 9e53565..0000000 --- a/src/chrome/content/rules/Amazon.xml +++ /dev/null @@ -1,19 +0,0 @@ -<ruleset name="Amazon (partial)"> - -<!-- Amazon appears to operate in 7 countries, and does not hold the domains - for some others, like .se or .be. In other cases there is an http-only site - that redirects to one of these 7 countries. --> - - <!-- We totally need to figure out if we can have a blanket redirect - for Amazon Web Services, which are a very popular CDN that appears - to support HTTPS! --> - - <rule from="^http://(www\.)?amazon\.com/" to="https://www.amazon.com/"; /> - - <rule from="^http://(www\.)?amazon\.co\.(uk|jp)/" - to="https://www.amazon.co.$2/"; /> - - <rule from="^http://(www\.)?amazon\.(ca|cn|de|fr)/" - to="https://www.amazon.$2/"; /> - -</ruleset> -- 1.7.1
