[HTTPS-Everywhere] Extending MacWorld and PCWorld rules

[Osama Khalid]

Hello,

Recently, PCWorld and MacWorld rules were added but they didn't
include URLs without 'www.'. These patches fixes the issue.

They are probably too trivial to be covered by copyright but in case
they're eligible, they're licensed under GPLv2+.

-- Osama Khalid
-------------- next part --------------
diff --git a/src/chrome/content/rules/PCWorld.xml b/src/chrome/content/rules/PCWorld.xml
index 7c9f338..b38f514 100644
--- a/src/chrome/content/rules/PCWorld.xml
+++ b/src/chrome/content/rules/PCWorld.xml
@@ -1,6 +1,7 @@
 <ruleset name="PC World">
+  <target host="pcworld.com" />
   <target host="www.pcworld.com" />
 
-  <rule from="^http://www\.pcworld\.com/" to="https://www.pcworld.com/"/>
-  
+  <!-- The certificate only applies to the URL with www.-->
+  <rule from="^http://(www\.)?pcworld\.com/" to="https://www.pcworld.com/" />
 </ruleset>
-------------- next part --------------
diff --git a/src/chrome/content/rules/MacWorld.xml b/src/chrome/content/rules/MacWorld.xml
index f73fa12..216c882 100644
--- a/src/chrome/content/rules/MacWorld.xml
+++ b/src/chrome/content/rules/MacWorld.xml
@@ -1,6 +1,7 @@
 <ruleset name="MacWorld">
+  <target host="macworld.com" />
   <target host="www.macworld.com" />
 
-  <rule from="^http://www\.macworld\.com/" to="https://www.macworld.com/"/>
-  
+  <!-- The certificate only applies to the URL with www.-->
+  <rule from="^http://(www\.)?macworld\.com/" to="https://www.macworld.com/" />
 </ruleset>