[HTTPS-E Rulesets] Updated GoogleServie.xml + New Polldaddy.xml

[Osama Khalid]

The updated GoogleServie.xml basically only adds pack.google.com and
google.com/ads/ to the ruleset. The rest of the changes are only to
standardize the ruleset structure.

--Osama Khalid
-------------- next part --------------
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 8797123..4084f4c 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -46,9 +46,6 @@
   <rule from="^http://sites\.google\.com/"
           to="https://sites.google.com/"/>
 
-  <rule from="^http://(www\.)?google((\.com?)?(\.[^/@:][^/@:])?)/calendar"
-          to="https://www.google$2/calendar" />
-
   <!-- This worked for a while but seems to be unstable
   <rule from="^http://(www\.)?google((\.com?)?(\.[^/@:][^/@:])?)/products"
           to="https://www.google$2/products" />
@@ -68,16 +65,11 @@
 
   <rule from="^http://(www\.)?googlecode\.com/$"
           to="https://code.google.com/" />
-  <rule from="^http://([^/:@]*)\.googlecode\.com/$"
+  <rule from="^http://([^/:@]+)\.googlecode\.com/$"
           to="https://code.google.com/p/$1/" />
-  <rule from="^http://([^/:@]*)\.googlecode\.com/(.+)"
+  <rule from="^http://([^/:@]+)\.googlecode\.com/(.+)"
           to="https://$1.googlecode.com/$2" />
 
-  <rule from="^http://trends\.google\.com/"
-          to="https://www.google.com/trends"/>
-  <rule from="^http://(www\.)?google((\.com?)?(\.[^/@:][^/@:])?)/trends"
-          to="https://www.google.com/trends"/>
-
   <rule from="^http://(www\.)?google\.com/finance"
           to="https://www.google.com/finance"/>
   <rule from="^http://(www\.)?google\.co\.uk/finance"
@@ -89,17 +81,21 @@
   <rule from="^http://(www\.)?google\.com/phone/"
           to="https://www.google.com/phone/"/>
   <rule from="^http://feedburner\.google\.com/"
-        to="https://feedburner.google.com/"/>
+          to="https://feedburner.google.com/"/>
+  <rule from="^http://trends\.google\.com/"
+          to="https://www.google.com/trends"/>
+  <rule from="^http://pack\.google\.com/"
+	  to="https://pack.google.com/"/>
   <rule from="^http://appengine\.google\.com/"
-	to="https://appengine.google.com/"/>
+       	  to="https://appengine.google.com/"/>
   <rule from="^http://([^@:\./]+\.)?appspot\.com/"
-        to="https://$1appspot.com/"/>
+          to="https://$1appspot.com/"/>
   <rule from="^http://pagead2\.googlesyndication\.com/"
 	  to="https://pagead2.googlesyndication.com/"/>
   <rule from="^http://googleusercontent\.com/"
-	to="https://www.googleusercontent.com/"/>
+	  to="https://www.googleusercontent.com/"/>
   <rule from="^http://([^@:\./]+)\.googleusercontent\.com/"
-	to="https://$1.googleusercontent.com/"/>
+	  to="https://$1.googleusercontent.com/"/>
 
   <rule from="^http://(www\.)?google\.com/contacts"
           to="https://www.google.com/contacts"/>
@@ -108,14 +104,12 @@
   <rule from="^http://(www\.)?google\.co\.in/contacts"
           to="https://www.google.co.in/contacts"/>
 
-  <rule from="^http://(www\.)?google(\.com?)?(\.[^/@:][^/@:])?/(css|intl|js|logos|tools|googleblogs)/"
+  <rule from="^http://(www\.)?google(\.com?)?(\.[^/@:][^/@:])?/(ads|css|intl|js|logos|tools|googleblogs|support)/"
 	  to="https://www.google.com/$4/"/>
+  <rule from="^http://(www\.)?google(\.com?)?(\.[^/@:][^/@:])?/(calendar|dictionary|trends)"
+          to="https://www.google.com/$4"/>
   <rule from="^http://(www\.)?google(\.com?)?(\.[^/@:][^/@:])?/(cse|custom)"
 	  to="https://www.google.com/cse" />
-  <rule from="^http://(www\.)?google(\.com?)?(\.[^/@:][^/@:])?/dictionary"
-          to="https://www.google.com/dictionary"/>
-  <rule from="^http://(www\.)?google(\.com?)?(\.[^/@:][^/@:])?/support/"
-          to="https://www.google.com/support/"/>
 
   <rule from="^http://(www\.)?google\.com/newproducts/"
           to="https://www.google.com/newproducts/"/>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Polldaddy.xml
Type: text/xml
Size: 298 bytes
Desc: not available
URL: <http://lists.eff.org/pipermail/https-everywhere-rules/attachments/20110617/51aaa782/attachment.xml>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.eff.org/pipermail/https-everywhere-rules/attachments/20110617/51aaa782/attachment.sig>