Author: Peter Eckersley <[email protected]> Date: Mon, 1 Nov 2010 16:53:45 -0700 Subject: Make the dropbox rule less ambitious Commit: e61765c69099dca86f92478d5d78a37251088985
--- pending-rules/Enom.xml | 6 ++++++ src/chrome/content/rules/Dropbox.xml | 4 +++- src/chrome/content/rules/Enom.xml | 3 --- src/install.rdf | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 pending-rules/Enom.xml delete mode 100644 src/chrome/content/rules/Enom.xml diff --git a/pending-rules/Enom.xml b/pending-rules/Enom.xml new file mode 100644 index 0000000..9ab2b30 --- /dev/null +++ b/pending-rules/Enom.xml @@ -0,0 +1,6 @@ +<ruleset name="Enom"> + <!-- Probably not be shippable until + http://www.enom.com/domainsearch/default.aspx is unbroken or an appropriate + exclusion is written for it --> + <rule from="^http://(www\.)?enom\.com/" to="https://www.enom.com/"/> +</ruleset> diff --git a/src/chrome/content/rules/Dropbox.xml b/src/chrome/content/rules/Dropbox.xml index 96d77e1..cd160bd 100644 --- a/src/chrome/content/rules/Dropbox.xml +++ b/src/chrome/content/rules/Dropbox.xml @@ -1,4 +1,6 @@ <ruleset name="Dropbox"> - <rule from="^http://dropbox\.com/"; to="https://www.dropbox.com/"/> + <rule from="^http://(www\.)?dropbox\.com/" to="https://www.dropbox.com/"/> + <!-- This breaks blog.dropbox.com and forums.dropbox.com, for example <rule from="^http://([^/:@]+)\.dropbox\.com/" to="https://$1.dropbox.com/"/> + --> </ruleset> diff --git a/src/chrome/content/rules/Enom.xml b/src/chrome/content/rules/Enom.xml deleted file mode 100644 index 1d7abf1..0000000 --- a/src/chrome/content/rules/Enom.xml +++ /dev/null @@ -1,3 +0,0 @@ -<ruleset name="Enom"> - <rule from="^http://(www\.)?enom\.com/" to="https://www.enom.com/"/> -</ruleset> diff --git a/src/install.rdf b/src/install.rdf index 2fcd295..9ed2be4 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -12,7 +12,7 @@ <em:iconURL>chrome://https-everywhere/skin/https-everywhere.png</em:iconURL> <em:updateURL>https://www.eff.org/files/https-everywhere-update.rdf</em:updateURL> <em:unpack>true</em:unpack> <!-- Required for Firefox 4 --> - <em:updateKey="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSry2bbc4waMQHAqFZ7dR53eJUXR8EMAW/TxMqT2Tnx1Zd16nh7RCv2/lVWpSD706SmZC39mUpJPkc53XEZtdRelWIh0+oBK5kjhDx+C+N6IzWPScbL+NdIymNpA4yIHMYkfX5XJgJ67l6JkFzqoWPorcw8dhxUeRASMwEM6B1EQIDAQAB"> + <em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSry2bbc4waMQHAqFZ7dR53eJUXR8EMAW/TxMqT2Tnx1Zd16nh7RCv2/lVWpSD706SmZC39mUpJPkc53XEZtdRelWIh0+oBK5kjhDx+C+N6IzWPScbL+NdIymNpA4yIHMYkfX5XJgJ67l6JkFzqoWPorcw8dhxUeRASMwEM6B1EQIDAQAB</em:updateKey> <!-- firefox --> <em:targetApplication> <Description> -- 1.7.1
