Merge branch 'master' of github.com:EFForg/https-everywhere into http…

…s-from-refactor

src/chrome/content/rules/Acessoseguro.net.xml

@@ -3,7 +3,7 @@
 	<target host="*.acessoseguro.net" />
 
 
-	<securecookie host=".+\.acessoseguro\.net$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
 	<rule from="^http://([\w-]+)\.acessoseguro\.net/"

src/chrome/content/rules/BCGolf.com-mismatches.xml

@@ -5,7 +5,7 @@
 		<!--	handled in main ruleset		-->
 		<exclusion pattern="^http://www\."/>
 
-	<securecookie host="^.*\.golf2go\.net$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 	<rule from="^http://([\w\-]+)\.golf2go\.net/"
 		to="https://$1.golf2go.net/"/>

src/chrome/content/rules/Bauhaus-University_Weimar.xml

@@ -9,13 +9,13 @@
 -->
 <ruleset name="Bauhaus-University Weimar (partial)">
 
-	<target host="*.uni-weimar.de" />
+	<target host="webmail.uni-weimar.de" />
+	<target host="www.uni-weimar.de" />
 
 
-	<securecookie host="^.+\.uni-weimar\.de$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
-	<rule from="^http://w(ebmail|ww)\.uni-weimar\.de/"
-		to="https://w$1.uni-weimar.de/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>

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

@@ -0,0 +1,11 @@
+<ruleset name="Bundespatentgericht.de">
+	<!-- Federal Patent Court -->
+
+	<target host="www.bundespatentgericht.de" />
+	<target host="juris.bundespatentgericht.de" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+
+</ruleset>

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

@@ -0,0 +1,11 @@
+<ruleset name="Bundespraesident.de">
+	<!-- Federal President -->
+
+	<target host="bundespraesident.de" />
+	<target host="www.bundespraesident.de" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+
+</ruleset>

src/chrome/content/rules/ChampionCasino.net.xml

@@ -1,22 +1,8 @@
-<!--
-	Nonfunctional subdomains:
-
-		- (www.) *
-		- api *
-		- dlc
-
-	* 400
-
--->
 <ruleset name="ChampionCasino.net (partial)">
+	<target host="championcasino.net" />
+	<target host="www.championcasino.net" />
 
-	<target host="*.championcasino.net" />
-
-
-	<securecookie host="^.+\.championcasino\.net$" name=".+" />
-
-
-	<rule from="^http://(cdn1|pay|sec)\.championcasino\.net/"
-		to="https://$1.championcasino.net/" />
+	<securecookie host=".+" name=".+" />
 
-</ruleset>
+	<rule from="^http:" to="https:" />
+</ruleset>

src/chrome/content/rules/CloudSwitch.xml

@@ -11,7 +11,7 @@ Fetch error: http://cloudswitch.com/ => https://cloudswitch.com/: (51, "SSL: no
 	<target host="cloudswitch.com"/>
 	<target host="*.cloudswitch.com"/>
 
-	<securecookie host=".*cloudswitch\.com$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 	<rule from="^http://(\w+\.)?cloudswitch\.com/"
 		to="https://$1cloudswitch.com/"/>

src/chrome/content/rules/Common_Criteria_Portal.xml

@@ -8,7 +8,7 @@
 
 		<test url="http://www.commoncriteriaportal.org/" />
 
-    <securecookie host=".*\.commoncriteriaportal\.org$" name=".+" />
+    <securecookie host=".+" name=".+" />
 
     <rule from="^http:"
         to="https:" />

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

@@ -1,16 +1,16 @@
 <!--
 	For other Demand Media coverage, see Demand-Media.xml.
 
+	Non-functional hosts
+		Couldn't connect to server:
+		- dmtracker.com
+		- vs.dmtracker.com
+
+		Timeout was reached:
+		- www.dmtracker.com
 -->
 <ruleset name="DM tracker.com">
+	<target host="extended.dmtracker.com" />
 
-	<target host="*.dmtracker.com" />
-
-
-	<securecookie host="^.*\.dmtracker\.com$" name=".+" />
-
-
-	<rule from="^http://(extended|vs)\.dmtracker\.com/"
-		to="https://$1.dmtracker.com/" />
-
+	<rule from="^http:" to="https:" />
 </ruleset>

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

@@ -7,7 +7,7 @@
 	<target host="bank.demdex.com" />
 
 
-	<securecookie host=".*\.demdex\.com$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
 	<rule from="^http:"

src/chrome/content/rules/Demdex.net.xml

@@ -33,7 +33,7 @@
 	<!--securecookie host="\.demdex\.net$" name="^demdex$" /-->
 	<!--securecookie host="\.dpm\.demdex\.net$" name="^(DexLifeCycle|dexoo|dpm)$" /-->
 
-	<securecookie host=".*\.demdex\.net$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
 	<rule from="^http:"

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

@@ -39,7 +39,7 @@
 					-->
 	<!--securecookie host="^(affiliates|c)\.eblastengine\.com$" name="^BIGipServer[\w-]+$" /-->
 
-	<securecookie host="^.*\.eblastengine\.com$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
 	<rule from="^http:"

src/chrome/content/rules/EUKhosting.xml

@@ -15,7 +15,7 @@
 	<target host="*.eukhosting.net" />
 
 
-	<securecookie host=".+\.eukhosting.net$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
 	<rule from="^http://(?!www\.)([\w-]+)\.eukhosting\.net/"

src/chrome/content/rules/Easyspace.xml

@@ -12,13 +12,12 @@
 -->
 <ruleset name="Easyspace (partial)">
 
-	<target host="*.easyspace.com" />
+	<target host="controlpanel.easyspace.com" />
 
 
-	<securecookie host="^.*\.easyspace\.com$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
-	<rule from="^http://controlpanel\.easyspace\.com/"
-		to="https://controlpanel.easyspace.com/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>

src/chrome/content/rules/Eloquent_JavaScript.net.xml

@@ -1,19 +1,13 @@
-
 <!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://eloquentjavascript.net/ => https://eloquentjavascript.net/: (51, "SSL: no alternative certificate subject name matches target host name 'eloquentjavascript.net'")
-Fetch error: http://www.eloquentjavascript.net/ => https://www.eloquentjavascript.net/: (51, "SSL: no alternative certificate subject name matches target host name 'www.eloquentjavascript.net'")
-
-Disabled by https-everywhere-checker because:
-Fetch error: http://eloquentjavascript.net/ => https://eloquentjavascript.net/: (51, "SSL: no alternative certificate subject name matches target host name 'eloquentjavascript.net'")
-Fetch error: http://www.eloquentjavascript.net/ => https://www.eloquentjavascript.net/: (51, "SSL: no alternative certificate subject name matches target host name 'www.eloquentjavascript.net'")
+	Wildcard DNS:
+		https://www.eloquentjavascript.net/Eloquent_JavaScript.pdf
 -->
-<ruleset name="Eloquent JavaScript.net" default_off='failed ruleset test'>
-
+<ruleset name="Eloquent_JavaScript.net">
 	<target host="eloquentjavascript.net" />
 	<target host="www.eloquentjavascript.net" />
+	<target host="fr.eloquentjavascript.net" />
 
+	<rule from="^http://www\.eloquentjavascript\.net/" to="https://eloquentjavascript.net/" />
 
 	<rule from="^http:" to="https:" />
-
-</ruleset>
+</ruleset>

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

@@ -0,0 +1,10 @@
+<ruleset name="FlyEdelweiss.com (partial)">
+	<target host="flyedelweiss.com" />
+	<target host="www.flyedelweiss.com" />
+	<target host="booking.flyedelweiss.com" />
+
+	<!-- https://flyedelweiss.com: connection reset -->
+	<rule from="^http://flyedelweiss\.com/"
+		to="https://www.flyedelweiss.com/" />
+	<rule from="^http:" to="https:" />
+</ruleset>

src/chrome/content/rules/George-Washington-University.xml

@@ -27,19 +27,20 @@
 -->
 <ruleset name="GWU.edu (partial)">
 
-	<target host="*.gwu.edu" />
+	<target host="gwtoday.gwu.edu" />
+	<target host="www.seas.gwu.edu" />
+	<target host="www.gwu.edu" />
 		<!--
 			Avoid broken MCB:
 						-->
 		<exclusion pattern="^http://www\.seas\.gwu\.edu/+(?!~|favicon\.ico|sites/)" />
 
 
-	<securecookie host="^.*\.gwu\.edu$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
 	<!--	!www doesn't exist.
 					-->
-	<rule from="^http://(gwtoday|www\.seas|www)\.gwu\.edu/"
-		to="https://$1.gwu.edu/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>

src/chrome/content/rules/Google_App_Engine.xml

@@ -32,7 +32,7 @@
 	<test url="http://hstspreload.appspot.com/" />
 
 
-	<securecookie host="^.+\.appspot\.com$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
 	<rule from="^http:"

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

@@ -7,7 +7,7 @@
 	<target host="*.c13.hesecure.com" />
 
 
-	<securecookie host=".+\.c13\.hesecure\.com$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
 	<rule from="^http://([\w-]+)\.c13\.hesecure\.com/"

src/chrome/content/rules/Higher_Education_Academy.xml

@@ -1,35 +1,27 @@
 <!--
 	Nonfunctional subdomains:
 
-		- (www.)	(replies with http)
-
-
-	Fully covered subdomains:
-
-		- anywhere
-		- autodiscover
-		- groupspace
-		- heagateway
-		- heamysites
-		- integra
-		- my
-		- oma
-		- owa
-		- portaltest
-		- servicedesk
-		- vpn
-		- webmail
+	Connection refused:
+		- autodiscover.heacademy.ac.uk
 
 -->
 <ruleset name="Higher Education Academy (partial)">
 
-	<target host="*.heacademy.ac.uk" />
+	<target host="heacademy.ac.uk" />
+	<target host="www.heacademy.ac.uk" />
+	<target host="anywhere.heacademy.ac.uk" />
+	<target host="groupspace.heacademy.ac.uk" />
+	<target host="heagateway.heacademy.ac.uk" />
+	<target host="heamysites.heacademy.ac.uk" />
+	<target host="my.heacademy.ac.uk" />
+	<target host="oma.heacademy.ac.uk" />
+	<target host="owa.heacademy.ac.uk" />
+	<target host="webmail.heacademy.ac.uk" />
 
 
-	<securecookie host="^.+\.heacademy\.ac\.uk$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
-	<rule from="^http://(anywhere|autodiscover|groupspace|heagateway|heamysites|integra|my|o[mw]a|portaltest|servicedesk|vpn|webmail)\.heacademy\.ac\.uk/"
-		to="https://$1.heacademy.ac.uk/" />
+	<rule from="^http:" to="https:" />
 
-</ruleset>
+</ruleset>

src/chrome/content/rules/IGrasp.xml

@@ -3,7 +3,7 @@
 	<target host="*.i-grasp.com" />
 
 
-	<securecookie host="^.+\.i-grasp\.com$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
 	<rule from="^http://([\w-]+)\.i-grasp\.com/"

src/chrome/content/rules/Ibiza-Rocks.xml

@@ -11,7 +11,7 @@ Fetch error: http://mrh.ibizarocks.com/ => https://mrh.ibizarocks.com/: (6, 'Cou
 	<target host="mrh.ibizarocks.com" />
 
 
-	<securecookie host="^.*\.ibizarocks\.com$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
 	<rule from="^http:" to="https:" />

src/chrome/content/rules/Instella_Platform.xml

@@ -9,7 +9,7 @@
 	<target host="*.instellaplatform.com" />
 
 
-	<securecookie host="^.+\.instellaplatform\.com$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
 	<!--	Unique subdomains for each client.