Merge pull request EFForg#2628 from KommX/launchpad

jsha · jsha · commit c291fbc5753c · 2015-08-21T09:12:45.000-07:00
Launchpad
diff --git a/src/chrome/content/rules/Launchpad.xml b/src/chrome/content/rules/Launchpad.xml
@@ -59,16 +59,16 @@
     <target host="launchpadlibrarian.net" />
     <target host="*.launchpadlibrarian.net" />
 
-		<!--	Redirects to http:
-						-->
-		<!--exclusion pattern="^http://feeds\.launchpad\.net/($|\w+/announcements\.atom$)" /-->
 		<!--
 			We preempt redirect from $:
 							-->
 		<exclusion pattern="^http://feeds\.launchpad\.net/(?!$)" />
+		<exclusion pattern="^http://ppa\.launchpad\.net/"/>
 
 			<test url="http://feeds.launchpad.net/" />
 			<test url="http://feeds.launchpad.net/rohc/announcements.atom" />
+			<test url="http://ppa.launchpad.net/" />
+			
 
 		<test url="http://answers.launchpad.net/" />
 		<test url="http://bazaar.launchpad.net/" />
@@ -85,10 +85,7 @@
 
 	<!--	Not secured by server:
 					-->
-	<!--securecookie host="^blog\.launchpad\.net$" name="^((wordpress|wordpress_logged_in|wordpress_sec|wordpresspass|wordpressuser)_[\da-f]{32}|wordpress_test_cookie)$" /-->
-	<!--securecookie host="^login\.launchpad\.net$" name="^openid_referer$" /-->
-
-    <securecookie host="^(?:.*\.)?launchpad\.net$" name=".+" />
+	<securecookie host="^(?:.*\.)?launchpad\.net$" name=".+" />
     <securecookie host="^(?:.*\.)?launchpadlibrarian\.net$" name=".+" />
 
     <exclusion pattern="^http://blog\.launchpad\.net/" />
