[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] [https-everywhere/master 1/2] ensure trailing slashes in existing rules (closes #1674)
Author: Daniel Kahn Gillmor <dkg@xxxxxxxxxxxxxxxxx>
Date: Mon, 27 Sep 2010 16:03:52 -0400
Subject: ensure trailing slashes in existing rules (closes #1674)
Commit: 13e00eae2562eeb5ebfc566cbdcb118b840f4218
---
src/chrome/content/rules/DuckDuckGo.xml | 6 +++---
src/chrome/content/rules/EFF.xml | 8 ++++----
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/Ixquick.xml | 8 ++++----
src/chrome/content/rules/Mozilla.xml | 10 +++++-----
src/chrome/content/rules/NYTimes.xml | 2 +-
src/chrome/content/rules/PayPal.xml | 4 ++--
src/chrome/content/rules/Torproject.xml | 8 ++++----
src/chrome/content/rules/WashingtonPost.xml | 4 ++--
src/chrome/content/rules/WordPress.xml | 6 +++---
src/chrome/content/rules/zGentooBugzilla.xml | 2 +-
src/chrome/content/rules/zNoisebridge.xml | 4 ++--
14 files changed, 52 insertions(+), 52 deletions(-)
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 6b27d5d..995d3c1 100644
--- a/src/chrome/content/rules/EFF.xml
+++ b/src/chrome/content/rules/EFF.xml
@@ -1,9 +1,9 @@
<ruleset name="EFF">
- <exclusion pattern="^http://action\.eff\.org"/>
+ <exclusion pattern="^http://action\.eff\.org/"/>
- <rule from="^http://eff\.org"; to="https://eff.org"/>
+ <rule from="^http://eff\.org/"; to="https://eff.org/"/>
- <rule from="^http://www\.eff\.org"; to="https://www.eff.org"/>
+ <rule from="^http://www\.eff\.org/"; to="https://www.eff.org/"/>
<rule from="^http://secure\.eff\.org/shop";
to="https://secure.eff.org/site/Ecommerce?store_id=2441"; />
@@ -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/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/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/Mozilla.xml b/src/chrome/content/rules/Mozilla.xml
index 0834be6..3dfc650 100644
--- a/src/chrome/content/rules/Mozilla.xml
+++ b/src/chrome/content/rules/Mozilla.xml
@@ -3,9 +3,9 @@
<ruleset name="Mozilla">
- <rule from="^http://mozilla\.org"; to="https://www.mozilla.org"/>
- <rule from="^http://mozilla\.com"; to="https://www.mozilla.com"/>
- <rule from="^http://www\.mozilla\.org"; to="https://www.mozilla.org"/>
- <rule from="^http://www\.mozilla\.com"; to="https://www.mozilla.com"/>
- <rule from="^http://addons\.mozilla\.org"; to="https://addons.mozilla.org"/>
+ <rule from="^http://mozilla\.org/"; to="https://www.mozilla.org/"/>
+ <rule from="^http://mozilla\.com/"; to="https://www.mozilla.com/"/>
+ <rule from="^http://www\.mozilla\.org/"; to="https://www.mozilla.org/"/>
+ <rule from="^http://www\.mozilla\.com/"; to="https://www.mozilla.com/"/>
+ <rule from="^http://addons\.mozilla\.org/"; to="https://addons.mozilla.org/"/>
</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/Torproject.xml b/src/chrome/content/rules/Torproject.xml
index c6e3e30..12ffa9d 100644
--- a/src/chrome/content/rules/Torproject.xml
+++ b/src/chrome/content/rules/Torproject.xml
@@ -1,6 +1,6 @@
<ruleset name="Torproject">
- <exclusion pattern="^http://archive\.torproject\.org"/>
- <exclusion pattern="^http://media\.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/"/>
+ <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/WashingtonPost.xml b/src/chrome/content/rules/WashingtonPost.xml
index 6dcbc34..657be7b 100644
--- a/src/chrome/content/rules/WashingtonPost.xml
+++ b/src/chrome/content/rules/WashingtonPost.xml
@@ -1,4 +1,4 @@
<ruleset name="WashingtonPost">
- <rule from="^http://(www\.)?washingtonpost\.com"
- to="https://www.washingtonpost.com"/>
+ <rule from="^http://(www\.)?washingtonpost\.com/"
+ to="https://www.washingtonpost.com/"/>
</ruleset>
diff --git a/src/chrome/content/rules/WordPress.xml b/src/chrome/content/rules/WordPress.xml
index d64b006..9c5b274 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"/>
+ <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