[or-cvs] [https-everywhere/master 194/291] Rules which only took into account requests starting with www. when they should take into account requests without the www too

[schoen at torproject.org]

Author: Mike Cardwell <github at grepular.com>
Date: Wed, 13 Oct 2010 21:50:59 +0100
Subject: Rules which only took into account requests starting with www. when they should take into account requests without the www too
Commit: de8ef6eed2f711006b2a4cfcc47e6de5c68719ac

---
 src/chrome/content/rules/StartSSL.xml |    2 +-
 src/chrome/content/rules/UNM.xml      |    4 ++--
 src/chrome/content/rules/Woot.xml     |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/chrome/content/rules/StartSSL.xml b/src/chrome/content/rules/StartSSL.xml
index e8cae37..d69f1ae 100644
--- a/src/chrome/content/rules/StartSSL.xml
+++ b/src/chrome/content/rules/StartSSL.xml
@@ -1,3 +1,3 @@
 <ruleset name="StartSSL">
-  <rule from="^http://(www\.)startssl\.com/" to="https://www.startssl.com/"/>
+  <rule from="^http://(www\.)?startssl\.com/" to="https://$1startssl.com/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/UNM.xml b/src/chrome/content/rules/UNM.xml
index 6f2bb0b..50f3be6 100644
--- a/src/chrome/content/rules/UNM.xml
+++ b/src/chrome/content/rules/UNM.xml
@@ -1,4 +1,4 @@
 <ruleset name="UNM">
-  <rule from="^http://(www\.)unm\.edu/" to="https://www.unm.edu/"/>
-  <rule from="^http://(www\.)ece\.unm\.edu/" to="https://www.ece.unm.edu/"/>
+  <rule from="^http://(www\.)?unm\.edu/" to="https://www.unm.edu/"/>
+  <rule from="^http://(www\.)?ece\.unm\.edu/" to="https://www.ece.unm.edu/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/Woot.xml b/src/chrome/content/rules/Woot.xml
index 5a5ed1a..2219c89 100644
--- a/src/chrome/content/rules/Woot.xml
+++ b/src/chrome/content/rules/Woot.xml
@@ -1,3 +1,3 @@
 <ruleset name="Woot">
-  <rule from="^http://(www\.)woot\.com/" to="https://www.woot.com/"/>
+  <rule from="^http://(www\.)?woot\.com/" to="https://www.woot.com/"/>
 </ruleset>
-- 
1.7.1