[or-cvs] [https-everywhere/master 141/291] fix outstanding trailing slash problems with a number of rules
schoen at torproject.org
schoen at torproject.org
Sat Oct 30 00:32:39 UTC 2010
Author: Seth Schoen <schoen at eff.org>
Date: Fri, 8 Oct 2010 18:04:44 -0700
Subject: fix outstanding trailing slash problems with a number of rules
Commit: 0627b8ea793dfde6dc00ec3dc43374fa55d5e080
---
src/chrome/content/rules/AmericanExpress.xml | 4 +-
src/chrome/content/rules/BankofAmerica.xml | 2 +-
src/chrome/content/rules/Continental.xml | 6 ++--
src/chrome/content/rules/DuckDuckGo.xml | 6 ++--
src/chrome/content/rules/EFF.xml | 2 +-
src/chrome/content/rules/Epson.xml | 6 ++--
src/chrome/content/rules/Facebook.xml | 2 +-
src/chrome/content/rules/GMX.xml | 16 +++++-----
src/chrome/content/rules/GoogleAPIs.xml | 24 ++++++++--------
src/chrome/content/rules/Indymedia.xml | 39 ++++++++++++-------------
src/chrome/content/rules/Ixquick.xml | 8 ++--
src/chrome/content/rules/KernelOrg.xml | 6 ++--
src/chrome/content/rules/LensRentals.xml | 4 +-
src/chrome/content/rules/Microsoft.xml | 4 +-
src/chrome/content/rules/NYTimes.xml | 2 +-
src/chrome/content/rules/PayPal.xml | 4 +-
src/chrome/content/rules/ROBOXchange.xml | 2 +-
src/chrome/content/rules/Torproject.xml | 10 +++---
src/chrome/content/rules/TweetDeck.xml | 6 ++--
src/chrome/content/rules/WordPress.xml | 10 +++---
src/chrome/content/rules/zGentooBugzilla.xml | 2 +-
src/chrome/content/rules/zNoisebridge.xml | 4 +-
22 files changed, 84 insertions(+), 85 deletions(-)
diff --git a/src/chrome/content/rules/AmericanExpress.xml b/src/chrome/content/rules/AmericanExpress.xml
index 6e727a9..a11eb8a 100644
--- a/src/chrome/content/rules/AmericanExpress.xml
+++ b/src/chrome/content/rules/AmericanExpress.xml
@@ -2,6 +2,6 @@
<!-- Note that there are lots of subdomains and some are still unprotected,
but some don't work properly in HTTPS anyway. This is kind of a mess. -->
<ruleset name="AmericanExpress">
- <rule from="^http://(www\.)?americanexpress\.com" to="https://www.americanexpress.com"/>
- <rule from="^http://home.americanexpress\.com" to="https://home.americanexpress.com"/>
+ <rule from="^http://(www\.)?americanexpress\.com/" to="https://www.americanexpress.com/"/>
+ <rule from="^http://home.americanexpress\.com/" to="https://home.americanexpress.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/BankofAmerica.xml b/src/chrome/content/rules/BankofAmerica.xml
index 1acb115..d343dd3 100644
--- a/src/chrome/content/rules/BankofAmerica.xml
+++ b/src/chrome/content/rules/BankofAmerica.xml
@@ -1,4 +1,4 @@
<!-- Thanks to ForceTLS -->
<ruleset name="BofA">
- <rule from="^http://(www\.)?bankofamerica\.com" to="https://www.bankofamerica.com"/>
+ <rule from="^http://(www\.)?bankofamerica\.com/" to="https://www.bankofamerica.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Continental.xml b/src/chrome/content/rules/Continental.xml
index d8a2f0a..d8d5347 100644
--- a/src/chrome/content/rules/Continental.xml
+++ b/src/chrome/content/rules/Continental.xml
@@ -1,5 +1,5 @@
<ruleset name="Continental">
- <rule from="^http://(www\.)?continental\.com" to="https://www.continental.com"/>
- <rule from="^http://www\.covacations\.com" to="https://www.covacations.com"/>
- <rule from="^http://covacations\.com" to="https://www.covacations.com"/>
+ <rule from="^http://(www\.)?continental\.com/" to="https://www.continental.com/"/>
+ <rule from="^http://www\.covacations\.com/" to="https://www.covacations.com/"/>
+ <rule from="^http://covacations\.com/" to="https://www.covacations.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/DuckDuckGo.xml b/src/chrome/content/rules/DuckDuckGo.xml
index bf0949b..9a1b0e2 100644
--- a/src/chrome/content/rules/DuckDuckGo.xml
+++ b/src/chrome/content/rules/DuckDuckGo.xml
@@ -1,6 +1,6 @@
<!-- XXX: Needs more testing -->
<ruleset name="DuckDuckGo">
- <rule from="^http://duckduckgo\.com" to="https://duckduckgo.com"/>
- <rule from="^http://([^/:@]*)\.duckduckgo\.com"
- to="https://$1.duckduckgo.com"/>
+ <rule from="^http://duckduckgo\.com/" to="https://duckduckgo.com/"/>
+ <rule from="^http://([^/:@]*)\.duckduckgo\.com/"
+ to="https://$1.duckduckgo.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/EFF.xml b/src/chrome/content/rules/EFF.xml
index 92c16d7..732a32f 100644
--- a/src/chrome/content/rules/EFF.xml
+++ b/src/chrome/content/rules/EFF.xml
@@ -11,5 +11,5 @@
<rule from="^http://secure\.eff\.org/renew"
to="https://secure.eff.org/site/Donation2" />
- <rule from="^http://([^/:@]*)\.eff\.org" to="https://$1.eff.org"/>
+ <rule from="^http://([^/:@]*)\.eff\.org/" to="https://$1.eff.org/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Epson.xml b/src/chrome/content/rules/Epson.xml
index fa66d6a..53282a1 100644
--- a/src/chrome/content/rules/Epson.xml
+++ b/src/chrome/content/rules/Epson.xml
@@ -4,9 +4,9 @@
<exclusion pattern="^http://(www\.)?epson.com/([a-zA-Z]([a-zA-Z0-9])+){1}$"/>
<exclusion pattern="^http://(www\.)?epson.com/cgi-bin/Store/consumer/"/>
- <rule from="^http://(www\.)?epson.com" to="https://www.epson.com"/>
- <rule from="^http://was.epson.com" to="https://was.epson.com"/>
- <rule from="^http://pos.epson.com" to="https://pos.epson.com"/>
+ <rule from="^http://(www\.)?epson.com/" to="https://www.epson.com/"/>
+ <rule from="^http://was.epson.com/" to="https://was.epson.com/"/>
+ <rule from="^http://pos.epson.com/" to="https://pos.epson.com/"/>
<rule from="^https://(www\.)?epson.com/(([a-zA-Z]([a-zA-Z0-9])+){1})$" to="http://$1epson.com/$2"/>
</ruleset>
diff --git a/src/chrome/content/rules/Facebook.xml b/src/chrome/content/rules/Facebook.xml
index 61e65d9..12c18c5 100644
--- a/src/chrome/content/rules/Facebook.xml
+++ b/src/chrome/content/rules/Facebook.xml
@@ -1,3 +1,3 @@
<ruleset name="Facebook">
- <rule from="^http://www\.facebook\.com" to="https://www.facebook.com"/>
+ <rule from="^http://www\.facebook\.com/" to="https://www.facebook.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/GMX.xml b/src/chrome/content/rules/GMX.xml
index cbe440c..26fc903 100644
--- a/src/chrome/content/rules/GMX.xml
+++ b/src/chrome/content/rules/GMX.xml
@@ -4,24 +4,24 @@
to www.gmx.com; we may as well secure that a bit but it should
work regardless of whether we got all of these countries -->
- <rule from="^http://(www\.)?gmx.(se|it|ca|ru)"
- to="https://www.gmx.com" />
+ <rule from="^http://(www\.)?gmx.(se|it|ca|ru)/"
+ to="https://www.gmx.com/" />
<!-- In these domains GMX supports SSL right at the homepage -->
<!-- https://gmx.com appears to work but hopefully redirecting away won't
break anything.-->
- <rule from="^http://(www\.)?gmx\.(fr|co\.uk|ch|at|com|net)"
- to="https://www.gmx.$2" />
+ <rule from="^http://(www\.)?gmx\.(fr|co\.uk|ch|at|com|net)/"
+ to="https://www.gmx.$2/" />
<!-- gmx.de lives at gmx.net -->
- <rule from="^http://(www\.)?gmx\.de"
- to="https://www.gmx.net" />
+ <rule from="^http://(www\.)?gmx\.de/"
+ to="https://www.gmx.net/" />
<!-- a lot of the back-end work is reportedly done by service.gmx.* -->
- <rule from="^http://service\.gmx\.(com|net)"
- to="https://service.gmx.$1" />
+ <rule from="^http://service\.gmx\.(com|net)/"
+ to="https://service.gmx.$1/" />
</ruleset>
diff --git a/src/chrome/content/rules/GoogleAPIs.xml b/src/chrome/content/rules/GoogleAPIs.xml
index 88b4327..461a293 100644
--- a/src/chrome/content/rules/GoogleAPIs.xml
+++ b/src/chrome/content/rules/GoogleAPIs.xml
@@ -1,12 +1,12 @@
<ruleset name="Google APIs">
- <rule from="^http://www\.google-analytics\.com"
- to="https://ssl.google-analytics.com"/>
- <rule from="^http://ajax\.googleapis\.com"
- to="https://ajax.googleapis.com"/>
- <rule from="^http://fonts\.googleapis\.com"
- to="https://fonts.googleapis.com"/>
- <rule from="^http://themes\.googleusercontent\.com"
- to="https://themes.googleusercontent.com"/>
+ <rule from="^http://www\.google-analytics\.com/"
+ to="https://ssl.google-analytics.com/"/>
+ <rule from="^http://ajax\.googleapis\.com/"
+ to="https://ajax.googleapis.com/"/>
+ <rule from="^http://fonts\.googleapis\.com/"
+ to="https://fonts.googleapis.com/"/>
+ <rule from="^http://themes\.googleusercontent\.com/"
+ to="https://themes.googleusercontent.com/"/>
<!-- There is an interesting question about whether we should
append &strip=1 to all cache URLs. This causes them to load without
@@ -17,10 +17,10 @@
HTTPS server. -->
- <rule from="^http://webcache\.googleusercontent\.com"
- to="https://webcache.googleusercontent.com"/>
- <rule from="^http://api\.recaptcha\.net"
- to="https://api-secure.recaptcha.net"/>
+ <rule from="^http://webcache\.googleusercontent\.com/"
+ to="https://webcache.googleusercontent.com/"/>
+ <rule from="^http://api\.recaptcha\.net/"
+ to="https://api-secure.recaptcha.net/"/>
<rule from="^http://www\.google\.com/recaptcha/"
to="https://www.google.com/recaptcha/"/>
<rule from="^http://www\.google\.com/calendar/embed"
diff --git a/src/chrome/content/rules/Indymedia.xml b/src/chrome/content/rules/Indymedia.xml
index 1c83b3a..8f318bd 100644
--- a/src/chrome/content/rules/Indymedia.xml
+++ b/src/chrome/content/rules/Indymedia.xml
@@ -37,8 +37,7 @@
-->
<!-- global -->
- <rule from="^http://indymedia\.org" to="https://indymedia.org"/>
- <!-- TODO: also matches to i.o.uk -->
+ <rule from="^http://indymedia\.org/" to="https://indymedia.org/"/>
<!--
<rule from="^http://www\.indymedia\.org" to="https://www.indymedia.org"/>
@@ -46,31 +45,31 @@
-->
<!-- exclusion for infrastructure -->
- <exclusion pattern="^http://(www\.)?(print|translations|satellite)\.indymedia\.org"/>
+ <exclusion pattern="^http://(www\.)?(print|translations|satellite)\.indymedia\.org/"/>
<!-- exclusion for imcs -->
- <exclusion pattern="^http://(www\.)?(de|pr|india|italia|beirut)\.indymedia\.org"/>
+ <exclusion pattern="^http://(www\.)?(de|pr|india|italia|beirut)\.indymedia\.org/"/>
- <exclusion pattern="^http://(ambazonia|austin|beirut|bergstedt|blackcat|bulgaria|canarias|chiapas|colorado|dc|dl1\.video|hm|hudsonmohawk|jakarta|korea|laplana|lille1|mail\.se|minneapolis|mke|nettlau|newsreal|nycap|old\.estrecho|ottawa|perth|pl|rochester|romania|rous|russia|shiva|sweden|twincities|victoria|wmass|worcester|(www(1)?\.)?mexico|www3\.ch)\.indymedia\.org"/>
- <exclusion pattern="^http://(media[12]?\.argentina|buscador\.argentina)\.indymedia\.org"/>
- <exclusion pattern="^http://((dev\.)?boston)\.indymedia\.org"/>
- <exclusion pattern="^http://((www2?\.)?brasil|brazil)\.indymedia\.org"/>
- <exclusion pattern="^http://(chicago|chicago2|www0\.chicago|dev\.chicago)\.indymedia\.org"/>
- <exclusion pattern="^http://(de|media[12]?\.de|www[23]\.de|www[23]\.germany)\.indymedia\.org"/>
- <exclusion pattern="^http://((www[12]\.)?istanbul|media2?\.istanbul|bagimsiz-istanbul|istanbul\.bbm)\.indymedia\.org"/>
- <exclusion pattern="^http://((publish\.)?sandiego)\.indymedia\.org"/>
+ <exclusion pattern="^http://(ambazonia|austin|beirut|bergstedt|blackcat|bulgaria|canarias|chiapas|colorado|dc|dl1\.video|hm|hudsonmohawk|jakarta|korea|laplana|lille1|mail\.se|minneapolis|mke|nettlau|newsreal|nycap|old\.estrecho|ottawa|perth|pl|rochester|romania|rous|russia|shiva|sweden|twincities|victoria|wmass|worcester|(www(1)?\.)?mexico|www3\.ch)\.indymedia\.org/"/>
+ <exclusion pattern="^http://(media[12]?\.argentina|buscador\.argentina)\.indymedia\.org/"/>
+ <exclusion pattern="^http://((dev\.)?boston)\.indymedia\.org/"/>
+ <exclusion pattern="^http://((www2?\.)?brasil|brazil)\.indymedia\.org/"/>
+ <exclusion pattern="^http://(chicago|chicago2|www0\.chicago|dev\.chicago)\.indymedia\.org/"/>
+ <exclusion pattern="^http://(de|media[12]?\.de|www[23]\.de|www[23]\.germany)\.indymedia\.org/"/>
+ <exclusion pattern="^http://((www[12]\.)?istanbul|media2?\.istanbul|bagimsiz-istanbul|istanbul\.bbm)\.indymedia\.org/"/>
+ <exclusion pattern="^http://((publish\.)?sandiego)\.indymedia\.org/"/>
<!-- domains with www prefix -->
- <rule from="^http://www\.([^/:@]*)\.indymedia\.org" to="https://www.$1.indymedia.org"/>
+ <rule from="^http://www\.([^/:@]*)\.indymedia\.org/" to="https://www.$1.indymedia.org/"/>
<!-- doamins without www as prefix -->
- <rule from="^http://([^/:@]*)\.indymedia\.org" to="https://$1.indymedia.org"/>
+ <rule from="^http://([^/:@]*)\.indymedia\.org/" to="https://$1.indymedia.org/"/>
<!-- indymedia.org.uk -->
- <rule from="^http://indymedia\.org\.uk" to="https://indymedia.org.uk"/>
- <rule from="^http://(london|notts|sheffield)\.indymedia\.org\.uk" to="https://$1.indymedia.org.uk"/>
- <rule from="^http://www\.(london|notts|sheffield)\.indymedia\.org\.uk" to="https://www.$1.indymedia.org.uk"/>
+ <rule from="^http://indymedia\.org\.uk/" to="https://indymedia.org.uk/"/>
+ <rule from="^http://(london|notts|sheffield)\.indymedia\.org\.uk/" to="https://$1.indymedia.org.uk/"/>
+ <rule from="^http://www\.(london|notts|sheffield)\.indymedia\.org\.uk/" to="https://www.$1.indymedia.org.uk/"/>
<!-- northern-indymedia.org -->
<!--
@@ -80,9 +79,9 @@ https differs http: mob.northern-indymedia.org, joinin.northern-indymedia.org, r
indyzines.northern-indymedia.org, sol.northern-indymedia.org, list.northern-indymedia.org
lists.northern-indymedia.org, mailinglist.northern-indymedia.org
-->
- <rule from="^http://northern-indymedia\.org" to="https://northern-indymedia.org"/>
- <rule from="^http://(www|m|mobi|mobile|wap)\.northern-indymedia\.org" to="https://$1.northern-indymedia.org"/>
+ <rule from="^http://northern-indymedia\.org/" to="https://northern-indymedia.org/"/>
+ <rule from="^http://(www|m|mobi|mobile|wap)\.northern-indymedia\.org/" to="https://$1.northern-indymedia.org/"/>
<!-- northernindymedia.org -->
- <rule from="^http://(www\.)?northernindymedia\.org" to="https://$1northern-indymedia.org"/>
+ <rule from="^http://(www\.)?northernindymedia\.org/" to="https://$1northern-indymedia.org/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Ixquick.xml b/src/chrome/content/rules/Ixquick.xml
index 17d604a..fdf797b 100644
--- a/src/chrome/content/rules/Ixquick.xml
+++ b/src/chrome/content/rules/Ixquick.xml
@@ -1,10 +1,10 @@
<ruleset name="Ixquick">
- <rule from="^http://ixquick\.com" to="https://ixquick.com"/>
- <rule from="^http://([^@/:]*)\.ixquick\.com" to="https://$1.ixquick.com"/>
+ <rule from="^http://ixquick\.com/" to="https://ixquick.com/"/>
+ <rule from="^http://([^@/:]*)\.ixquick\.com/" to="https://$1.ixquick.com/"/>
<!-- Ixquick and Startpage appear to be basically the same -->
- <rule from="^http://startpage\.com" to="https://startpage.com"/>
- <rule from="^http://([^@/:]*)\.startpage\.com" to="https://$1.startpage.com"/>
+ <rule from="^http://startpage\.com/" to="https://startpage.com/"/>
+ <rule from="^http://([^@/:]*)\.startpage\.com/" to="https://$1.startpage.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/KernelOrg.xml b/src/chrome/content/rules/KernelOrg.xml
index d12d72d..5dae234 100644
--- a/src/chrome/content/rules/KernelOrg.xml
+++ b/src/chrome/content/rules/KernelOrg.xml
@@ -1,9 +1,9 @@
<ruleset name="Kernel.org">
- <rule from="^http://kernel\.org" to="https://www.kernel.org"/>
+ <rule from="^http://kernel\.org/" to="https://www.kernel.org/"/>
<!-- subdomain-only certificates -->
- <rule from="^http://((www|ftp|pub|all|eu|boot|accounts|patchwork|bugzilla)\.kernel\.org)" to="https://$1"/>
+ <rule from="^http://((www|ftp|pub|all|eu|boot|accounts|patchwork|bugzilla)\.kernel\.org)/" to="https://$1/"/>
<!-- sub-subdomain certificates -->
- <rule from="^http://(([a-zA-Z0-9-]+\.)?(git|wiki)\.kernel\.org)" to="https://$1"/>
+ <rule from="^http://(([a-zA-Z0-9-]+\.)?(git|wiki)\.kernel\.org)/" to="https://$1/"/>
<!--
As of 2010-08-13, known unprotected domains are:
wireless.kernel.org
diff --git a/src/chrome/content/rules/LensRentals.xml b/src/chrome/content/rules/LensRentals.xml
index 6086699..2064314 100644
--- a/src/chrome/content/rules/LensRentals.xml
+++ b/src/chrome/content/rules/LensRentals.xml
@@ -1,3 +1,3 @@
<ruleset name="LensRentals.com">
- <rule from="^http://(www\.)?lensrentals\.com" to="https://www.lensrentals.com"/>
-</ruleset>
\ No newline at end of file
+ <rule from="^http://(www\.)?lensrentals\.com/" to="https://www.lensrentals.com/"/>
+</ruleset>
diff --git a/src/chrome/content/rules/Microsoft.xml b/src/chrome/content/rules/Microsoft.xml
index 5a63396..c31e209 100644
--- a/src/chrome/content/rules/Microsoft.xml
+++ b/src/chrome/content/rules/Microsoft.xml
@@ -1,4 +1,4 @@
<ruleset name="Microsoft">
- <rule from="^http://(www\.)?microsoft\.com" to="https://www.microsoft.com"/>
- <rule from="^http://(office|office2010|store)\.microsoft\.com" to="https://$1.microsoft.com"/>
+ <rule from="^http://(www\.)?microsoft\.com/" to="https://www.microsoft.com/"/>
+ <rule from="^http://(office|office2010|store)\.microsoft\.com/" to="https://$1.microsoft.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/NYTimes.xml b/src/chrome/content/rules/NYTimes.xml
index 0b68f1b..d121ba4 100644
--- a/src/chrome/content/rules/NYTimes.xml
+++ b/src/chrome/content/rules/NYTimes.xml
@@ -1,3 +1,3 @@
<ruleset name="NYTimes">
- <rule from="^http://(www\.)?nytimes\.com" to="https://www.nytimes.com"/>
+ <rule from="^http://(www\.)?nytimes\.com/" to="https://www.nytimes.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/PayPal.xml b/src/chrome/content/rules/PayPal.xml
index 3e60d41..530680e 100644
--- a/src/chrome/content/rules/PayPal.xml
+++ b/src/chrome/content/rules/PayPal.xml
@@ -1,4 +1,4 @@
<ruleset name="PayPal">
- <rule from="^http://www\.paypal\.com" to="https://www.paypal.com"/>
- <rule from="^http://paypal\.com" to="https://www.paypal.com"/>
+ <rule from="^http://www\.paypal\.com/" to="https://www.paypal.com/"/>
+ <rule from="^http://paypal\.com/" to="https://www.paypal.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/ROBOXchange.xml b/src/chrome/content/rules/ROBOXchange.xml
index 4a9027a..4acf9d0 100644
--- a/src/chrome/content/rules/ROBOXchange.xml
+++ b/src/chrome/content/rules/ROBOXchange.xml
@@ -1,3 +1,3 @@
<ruleset name="ROBOXchange">
- <rule from="^http://(www\.)?roboxchange\.com" to="https://roboxchange.com"/>
+ <rule from="^http://(www\.)?roboxchange\.com/" to="https://roboxchange.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/Torproject.xml b/src/chrome/content/rules/Torproject.xml
index 1c2c73b..c388abc 100644
--- a/src/chrome/content/rules/Torproject.xml
+++ b/src/chrome/content/rules/Torproject.xml
@@ -1,7 +1,7 @@
<ruleset name="Torproject">
- <exclusion pattern="^http://archive\.torproject\.org"/>
- <exclusion pattern="^http://media\.torproject\.org"/>
- <exclusion pattern="^http://deb\.torproject\.org"/>
- <rule from="^http://torproject\.org" to="https://torproject.org"/>
- <rule from="^http://([^/:@]*)\.torproject\.org" to="https://$1.torproject.org"/>
+ <exclusion pattern="^http://archive\.torproject\.org/"/>
+ <exclusion pattern="^http://media\.torproject\.org/"/>
+ <exclusion pattern="^http://deb\.torproject\.org/"/>
+ <rule from="^http://torproject\.org/" to="https://torproject.org/"/>
+ <rule from="^http://([^/:@]*)\.torproject\.org/" to="https://$1.torproject.org/"/>
</ruleset>
diff --git a/src/chrome/content/rules/TweetDeck.xml b/src/chrome/content/rules/TweetDeck.xml
index 0e052c1..3e158d2 100644
--- a/src/chrome/content/rules/TweetDeck.xml
+++ b/src/chrome/content/rules/TweetDeck.xml
@@ -1,4 +1,4 @@
<ruleset name="Tweetdeck">
- <exclusion pattern="^http://support\.tweetdeck\.com"/><!-- cert for wrong domain -->
- <rule from="^http://(www\.)?tweetdeck\.com" to="https://www.tweetdeck.com"/>
-</ruleset>
\ No newline at end of file
+ <exclusion pattern="^http://support\.tweetdeck\.com/"/><!-- cert for wrong domain -->
+ <rule from="^http://(www\.)?tweetdeck\.com/" to="https://www.tweetdeck.com/"/>
+</ruleset>
diff --git a/src/chrome/content/rules/WordPress.xml b/src/chrome/content/rules/WordPress.xml
index d64b006..936cf87 100644
--- a/src/chrome/content/rules/WordPress.xml
+++ b/src/chrome/content/rules/WordPress.xml
@@ -1,7 +1,7 @@
<ruleset name="WordPress.com">
- <exclusion pattern="^http://en.blog\.wordpress\.com"/>
- <exclusion pattern="^http://en.blog.files\.wordpress\.com"/>
- <rule from="^http://wordpress\.com" to="https://wordpress.com"/>
- <rule from="^http://www\.wordpress\.com" to="https://www.wordpress.com"/>
- <rule from="^http://([^/:@]*)\.wordpress\.com" to="https://$1.wordpress.com"/>
+ <exclusion pattern="^http://en.blog\.wordpress\.com/"/>
+ <exclusion pattern="^http://en.blog.files\.wordpress\.com/"/>
+ <rule from="^http://wordpress\.com/" to="https://wordpress.com/"/>
+ <rule from="^http://www\.wordpress\.com/" to="https://www.wordpress.com/"/>
+ <rule from="^http://([^/:@]*)\.wordpress\.com/" to="https://$1.wordpress.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/zGentooBugzilla.xml b/src/chrome/content/rules/zGentooBugzilla.xml
index 2b31ca5..e338767 100644
--- a/src/chrome/content/rules/zGentooBugzilla.xml
+++ b/src/chrome/content/rules/zGentooBugzilla.xml
@@ -1,3 +1,3 @@
<ruleset name="GentooBugzilla">
- <rule from="^http://bugs\.gentoo\.org" to="https://bugs.gentoo.org"/>
+ <rule from="^http://bugs\.gentoo\.org/" to="https://bugs.gentoo.org/"/>
</ruleset>
diff --git a/src/chrome/content/rules/zNoisebridge.xml b/src/chrome/content/rules/zNoisebridge.xml
index ff0ecf8..a5a1063 100644
--- a/src/chrome/content/rules/zNoisebridge.xml
+++ b/src/chrome/content/rules/zNoisebridge.xml
@@ -1,4 +1,4 @@
<ruleset name="Noisebridge">
- <rule from="^http://www\.noisebridge\.net" to="https://www.noisebridge.net"/>
- <rule from="^http://noisebridge\.net" to="https://www.noisebridge.net"/>
+ <rule from="^http://www\.noisebridge\.net/" to="https://www.noisebridge.net/"/>
+ <rule from="^http://noisebridge\.net/" to="https://www.noisebridge.net/"/>
</ruleset>
--
1.7.1
More information about the tor-commits
mailing list