[or-cvs] [https-everywhere/master 4/4] Improvements to the Facebook rule

[pde at torproject.org]

Author: Peter Eckersley <pde at eff.org>
Date: Thu, 11 Nov 2010 15:53:44 -0800
Subject: Improvements to the Facebook rule
Commit: 01ebccd60595a3ad3460ac09e66cbbdc87190abb

- include s-static.ak.facebookcom
- add a match_rule
---
 src/chrome/content/rules/Facebook.xml |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/chrome/content/rules/Facebook.xml b/src/chrome/content/rules/Facebook.xml
index cd2ff57..5ef3e73 100644
--- a/src/chrome/content/rules/Facebook.xml
+++ b/src/chrome/content/rules/Facebook.xml
@@ -1,6 +1,7 @@
-<ruleset name="Facebook">
+<ruleset name="Facebook" match_rule="http:.*facebook\.">
   <target host="facebook.com" />
   <target host="*.facebook.com" />
+  <target host="*.ak.facebook.com" />
   <target host="www.v6.facebook.com" />
   <target host="de-de.facebook.de" />
   <target host="www.facebook.de" />
@@ -12,11 +13,17 @@
   <securecookie host="^(.*\.)?facebook\.com$" name="xs" />
 
   <rule from="^http://(www\.)?facebook\.com/" to="https://www.facebook.com/"/>
-  <rule from="^http://m\.facebook\.com/" to="https://m.facebook.com/"/>
-  <rule from="^http://ssl\.facebook\.com/" to="https://ssl.facebook.com/"/>
-  <rule from="^http://login\.facebook\.com/" to="https://login.facebook.com/"/>
-  <rule from="^http://www\.v6\.facebook\.com/" to="https://www.v6.facebook.com/"/>
+  <rule from="^http://m\.facebook\.com/"      to="https://m.facebook.com/"/>
+  <rule from="^http://ssl\.facebook\.com/"    to="https://ssl.facebook.com/"/>
+  <rule from="^http://login\.facebook\.com/"  to="https://login.facebook.com/"/>
+  <rule from="^http://www\.v6\.facebook\.com/" 
+          to="https://www.v6.facebook.com/"/>
 
-  <rule from="^https?://(de-de|www\.)?facebook\.de/" to="https://www.facebook.com/"/>
-  <rule from="^https?://de-de\.facebook\.com/" to="https://www.facebook.com/"/>
+  <rule from="^http://s-static.ak.facebook.com/" 
+          to="https://s-static.ak.facebook.com/" />
+
+  <rule from="^https?://(de-de|www\.)?facebook\.de/" 
+          to="https://www.facebook.com/"/>
+  <rule from="^https?://de-de\.facebook\.com/" 
+          to="https://www.facebook.com/"/>
 </ruleset>
-- 
1.7.1