[pull] master from EFForg:master

src/chrome/content/rules/Cephalofair.com.xml

@@ -0,0 +1,16 @@
+<!--
+	Connection closed:
+		- calendar
+		- docs
+		- start
+
+	Mismatched:
+		- ftp
+		- ssh
+-->
+<ruleset name="Cephalofair.com">
+	<target host="cephalofair.com" />
+	<target host="www.cephalofair.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>

src/chrome/content/rules/Express.de.xml

@@ -5,14 +5,17 @@
 	- boerse.express.de
 	- formulare.express.de
 	- tvprogramm.express.de
+
+	Timeout:
+	- aboservice.express.de
 -->
 <ruleset name="Express.de (partial)">
 
 	<target host="express.de" />
 	<target host="www.express.de" />
-	<target host="aboservice.express.de" />
 	<target host="amp.express.de" />
 	<target host="biallo.express.de" />
+	<target host="consent.express.de" />
 	<target host="epages.express.de" />
 	<target host="horoskope.express.de" />
 	<target host="leserreisen.express.de" />

src/chrome/content/rules/HNA.de.xml

@@ -0,0 +1,79 @@
+<!--
+	Connection closed:
+		immo
+		www.immo
+		story
+
+	Invalid certificate:
+		blog
+		dev-doc
+		horoskop
+		kassellexikon
+		m
+		www.markt
+		lt.portal
+		quiz
+		secretescapes
+		www.secretescapes
+		tippspiel
+		uelzen
+		veranstaltungen
+
+	Mixed content:
+		regiowiki
+
+	Refused:
+		kb
+		luedenscheid
+
+	Timeout:
+		mattermost-staging.hna.de
+		service-archiv
+		smtp
+		transfer
+-->
+<ruleset name="HNA.de">
+
+	<target host="hna.de" />
+	<target host="www.hna.de" />
+	<target host="abos.hna.de" />
+	<target host="auto.hna.de" />
+	<target host="banner.hna.de" />
+	<target host="blogs.hna.de" />
+	<target host="doc.hna.de" />
+	<target host="epaper.hna.de" />
+	<target host="flirt.hna.de" />
+	<target host="forum.hna.de" />
+	<target host="het164.hna.de" />
+	<target host="het199.hna.de" />
+	<target host="het35.hna.de" />
+	<target host="het71.hna.de" />
+	<target host="jobs.hna.de" />
+	<target host="selbsteingabe.jobs.hna.de" />
+	<target host="kreiszeitung.hna.de" />
+	<target host="leserreisen.hna.de" />
+	<target host="markt.hna.de" />
+	<target host="medienvorschau.hna.de" />
+	<target host="mms.hna.de" />
+	<target host="nx02.hna.de" />
+	<target host="partner.hna.de" />
+	<target host="www.partner.hna.de" />
+	<target host="praemienshop.hna.de" />
+	<target host="redaktion.hna.de" />
+	<target host="tabellen.hna.de" />
+	<target host="tickets.hna.de" />
+	<target host="trauer.hna.de" />
+	<target host="www.trauer.hna.de" />
+	<target host="vorlage1.hna.de" />
+	<target host="vorlage2.hna.de" />
+	<target host="vorlage3.hna.de" />
+	<target host="vwdweb2.hna.de" />
+	<target host="wahlomat.hna.de" />
+	<target host="www2.hna.de" />
+	<target host="www3.hna.de" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+
+</ruleset>

src/chrome/content/rules/LongTail.xml

@@ -3,37 +3,24 @@
 		- Bitsontherun.com.xml
 		- JW_Platform.com.xml
 
-	Cert expired:
-		- dev.jwpltx.com
-		- i.dev.jwpltx.com
-		- stg.jwpltx.com
-
 	Cert mismatch:
-		- code.longtailvideo.com
-		- developer.longtailvideo.com
 		- go.longtailvideo.com
-		- secure.longtailvideo.com
-		- www2.longtailvideo.com
 		- ltvimg.com
 		- s0-www.ltvimg.com
 		- s1-www.ltvimg.com
 		- www.ltvimg.com
 		- a.jwpcdn.com
 		- p.jwpcdn.com, equivalent to ssl.p.jwpcdn.com
-		- go.jwplayer.com
-		- ovp.jwplayer.com
-		- i.n.jwpltx.com
+
+	Redirect loop:
+		- mvn.jwplayer.com
+
 	Timeout:
 		- demo.longtailvideo.com
 		- design.longtailvideo.com
 		- bob.jwplayer.com
 		- demo.jwplayer.com
-		- jw7.jwplayer.com
-		- jw7beta.jwplayer.com
 		- qa.jwplayer.com
-		- recommendations.jwplayer.com
-		- sdk.jwplayer.com
-
 
 	TLS error:
 		- g5bmawnx.cdn.jwplayer.com
@@ -44,19 +31,20 @@
 	<target host="ssl.p.jwpcdn.com" />
 
 	<target host="jwpltx.com" />
-	<target host="s.c.jwpltx.com" />
-	<target host="s.n.jwpltx.com" />
-	<target host="s.jwpltx.com" />
+	<target host="dev.jwpltx.com" />
+	<target host="stg.jwpltx.com" />
 
 	<target host="longtailvideo.com" />
 	<target host="www.longtailvideo.com" />
 	<target host="account.longtailvideo.com" />
-	<target host="api.longtailvideo.com" />
+	<target host="code.longtailvideo.com" />
+	<target host="developer.longtailvideo.com" />
 	<target host="l.longtailvideo.com" />
 	<target host="lp.longtailvideo.com" />
 	<target host="ova.longtailvideo.com" />
 	<target host="playertest.longtailvideo.com" />
 	<target host="plugins.longtailvideo.com" />
+	<target host="secure.longtailvideo.com" />
 	<target host="securel.longtailvideo.com" />
 	<target host="securelp.longtailvideo.com" />
 	<target host="secureplugins.longtailvideo.com" />
@@ -73,13 +61,13 @@
 	<target host="dashboard.jwplayer.com" />
 	<target host="developer.jwplayer.com" />
 	<target host="entitlements.jwplayer.com" />
-	<target host="icons.jwplayer.com" />
+	<target host="go.jwplayer.com" />
 	<target host="insights.jwplayer.com" />
-	<target host="mvn.jwplayer.com" />
-	<target host="portal-api.jwplayer.com" />
-	<target host="staging-icons.jwplayer.com" />
+	<target host="jw7.jwplayer.com" />
+	<target host="jw7beta.jwplayer.com" />
+	<target host="recommendations.jwplayer.com" />
+	<target host="sdk.jwplayer.com" />
 	<target host="status.jwplayer.com" />
-	<target host="support-static.jwplayer.com" />
 	<target host="support.jwplayer.com" />
 	<target host="tv.jwplayer.com" />
 	<target host="vr.jwplayer.com" />

src/chrome/content/rules/RequireJS.org.xml

@@ -0,0 +1,23 @@
+<!--
+	This domain contains a wildcard DNS record.
+
+	Refused:
+		m
+		wap
+		wwww
+-->
+<ruleset name="RequireJS.org">
+
+	<target host="requirejs.org" />
+	<target host="www.requirejs.org" />
+
+	<securecookie host=".+" name=".+" />
+
+	<!-- Invalid certificate on https://www.requirejs.org/,
+	http://www.requirejs.org/ redirects to https://requirejs.org/.-->
+	<rule from="^http://www\.requirejs\.org/"
+		to="https://requirejs.org/" />
+
+	<rule from="^http:" to="https:" />
+
+</ruleset>

src/chrome/content/rules/Spiegel.xml

@@ -20,6 +20,7 @@
 	<target host="fsm2.spiegel.de" />
 	<target host="magazin.spiegel.de" />
 	<target host="spiegel-de.spiegel.de" />
+	<target host="sats.spiegel.de" />
 	<target host="tippspiel.spiegel.de" />
 
 	<!--	Complications:

src/chrome/content/rules/TAG24.de.xml

@@ -0,0 +1,35 @@
+<!--
+	Invalid certificate:
+		test
+
+	Refused:
+		tag20
+-->
+<ruleset name="TAG24.de">
+
+	<target host="tag24.de" />
+	<target host="www.tag24.de" />
+	<target host="247.tag24.de" />
+	<target host="api.tag24.de" />
+	<target host="assets.tag24.de" />
+	<target host="backlog.tag24.de" />
+	<target host="campus.tag24.de" />
+	<target host="download.tag24.de" />
+	<target host="dynamic.tag24.de" />
+	<target host="fbia.tag24.de" />
+	<target host="go.tag24.de" />
+	<target host="jobs.tag24.de" />
+	<target host="media.tag24.de" />
+	<target host="mein.tag24.de" />
+	<target host="partyboot.tag24.de" />
+	<target host="pizza.tag24.de" />
+	<target host="redmine.tag24.de" />
+	<target host="staging.tag24.de" />
+	<target host="cito.staging.tag24.de" />
+	<target host="story.tag24.de" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+
+</ruleset>

src/chrome/content/rules/Tinypass.com.xml

@@ -3,23 +3,38 @@
 		assets.tinypass.com
 		jobs.tinypass.com
 
+	Timeout:
+		bc.tinypass.com
+		demo.tinypass.com
+		dev.tinypass.com
+		ew-demo.tinypass.com
+		github.tinypass.com
+		qa0.tinypass.com
+		qa1.tinypass.com
+		sw.tinypass.com
 -->
 <ruleset name="Tinypass.com">
 
 	<target host="tinypass.com" />
 	<target host="www.tinypass.com" />
 	<target host="api.tinypass.com" />
+	<target host="api-v3.tinypass.com" />
 	<target host="buy.tinypass.com" />
 	<target host="cdn.tinypass.com" />
+	<target host="cnbc-dev.tinypass.com" />
+	<target host="cnbc-sandbox.tinypass.com" />
 	<target host="code.tinypass.com" />
 	<target host="dashboard.tinypass.com" />
+	<target host="developer.tinypass.com" />
 	<target host="experience.tinypass.com" />
 	<target host="fonts.tinypass.com" />
 	<target host="id.tinypass.com" />
 	<target host="market.tinypass.com" />
 	<target host="media.tinypass.com" />
 	<target host="play.tinypass.com" />
+	<target host="pmauth-sandbox.tinypass.com" />
 	<target host="publisher.tinypass.com" />
+	<target host="sandbox.tinypass.com" />
 
 	<rule from="^http:" to="https:" />
 

src/chrome/content/rules/Twiago.com.xml

@@ -0,0 +1,16 @@
+<ruleset name="Twiago.com">
+
+	<target host="twiago.com" />
+	<target host="www.twiago.com" />
+	<target host="a.twiago.com" />
+	<target host="b.twiago.com" />
+	<target host="cdn.twiago.com" />
+	<target host="control.twiago.com" />
+	<target host="reco.twiago.com" />
+	<target host="sbtool.twiago.com" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+
+</ruleset>

src/chrome/content/rules/UST.hk.xml

@@ -74,6 +74,7 @@
 	<target host="cso.ust.hk" />
 
 	<target host="dao.ust.hk" />
+	<target host="datahub.ust.hk" />
 	<target host="dataspace.ust.hk" />
 	<target host="digitalimages.ust.hk" />
 	<target host="download.ust.hk" />
@@ -88,6 +89,8 @@
 	<target host="facultyprofiles.ust.hk" />
 
 	<target host="giving.ust.hk" />
+
+	<target host="hseo.ust.hk" />
 
 	<target host="idp.ust.hk" />
 	<test url="http://idp.ust.hk/idp/images/logo.png" />

src/chrome/content/rules/UpScore.com.xml

@@ -0,0 +1,21 @@
+<!--
+	Connection closed:
+		data
+-->
+<ruleset name="UpScore.com">
+
+	<target host="upscore.com" />
+	<target host="www.upscore.com" />
+	<target host="content.upscore.com" />
+	<target host="files.upscore.com" />
+		<test url="http://files.upscore.com/async/upScore.js" />
+	<target host="hit-error.upscore.com" />
+	<target host="hit-pool.upscore.com" />
+	<target host="hit-pool-2.upscore.com" />
+	<target host="positions.upscore.com" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+
+</ruleset>

src/chrome/content/rules/Welect.de.xml

@@ -0,0 +1,32 @@
+<!--
+	This domain contains a wildcard DNS record.
+
+	Invalid certificate:
+		www.s
+-->
+<ruleset name="Welect.de">
+
+	<target host="welect.de" />
+	<target host="www.welect.de" />
+	<target host="ssl.1.damoh.welect.de" />
+	<target host="ssl.2.damoh.welect.de" />
+	<target host="ssl.3.damoh.welect.de" />
+	<target host="de.welect.de" />
+	<target host="www.de.welect.de" />
+	<target host="example.welect.de" />
+	<target host="go.welect.de" />
+	<target host="go-staging.welect.de" />
+	<target host="integrator.welect.de" />
+	<target host="internal.welect.de" />
+	<target host="noserver.welect.de" />
+	<target host="production.welect.de" />
+	<target host="redirect-staging.welect.de" />
+	<target host="s.welect.de" />
+	<target host="staging.welect.de" />
+	<target host="static.welect.de" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+
+</ruleset>