OpenID exclusion for identi.ca

pde · pde · commit 23fb4da4df29 · 2011-11-29T10:59:17.000-08:00
Conflicts:

	src/chrome/content/rules/Identica.xml
diff --git a/src/chrome/content/rules/Identica.xml b/src/chrome/content/rules/Identica.xml
@@ -2,5 +2,13 @@
   <target host="www.identi.ca" />
   <target host="identi.ca" />
 
-  <rule from="^http://(www\.)?identi\.ca/" to="https://identi.ca/"/>
+  <!-- https://mail1.eff.org/pipermail/https-everywhere-rules/2011-November/000793.html -->
+  <exclusion pattern="^http://identi\.ca/main/openid" />
+
+  <rule from="^http://(?:www\.)?identi\.ca/"
+	        to="https://identi.ca/"/>
+  <rule from="^http://files\.status\.net/"
+	        to="https://files.status.net/"/>
+  <rule from="^http://(meteor\d+\.identi\.ca)/" 
+          to="https://$1/" />
 </ruleset>
