Merge pull request EFForg#1836 from graingert/patch-2

reedy · reedy · commit 364fab41c5b3 · 2015-06-13T12:42:38.000-04:00
Univerisity of southampton should be fine now
diff --git a/src/chrome/content/rules/University-of-Southampton.xml b/src/chrome/content/rules/University-of-Southampton.xml
@@ -1,12 +1,10 @@
 <!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://soton.ac.uk/ => https://www.soton.ac.uk/: (7, 'Failed to connect to soton.ac.uk port 80: Connection timed out')
 	Fully covered domains:
 
 		- secure.ecs.soton.ac.uk
 
 -->
-<ruleset name="University of Southampton (partial)" default_off='failed ruleset test'>
+<ruleset name="University of Southampton (partial)">
 
 	<target host="noc.ac.uk" />
 	<!--
@@ -25,21 +23,24 @@ Fetch error: http://soton.ac.uk/ => https://www.soton.ac.uk/: (7, 'Failed to con
 
 	<!--	Cert is not valid for www.
 						-->
-	<rule from="^http://www\.noc\.ac\.uk/"
+	<rule from="^http://(www\.)?noc\.ac\.uk/"
 		to="https://noc.ac.uk/" />
 
-	<rule from="^http://noc\.ac\.uk/(f|sites)/"
-		to="https://noc.ac.uk/$1/" />
-
 	<rule from="^http://(?:www\.)?soton\.ac\.uk/"
 		to="https://www.soton.ac.uk/" />
 
 	<rule from="^http://secure\.ecs\.soton\.ac\.uk/"
 		to="https://secure.ecs.soton.ac.uk/" />
 
+	<test url="http://secure.ecs.soton.ac.uk/" />
+	<test url="http://secure.ecs.soton.ac.uk/mail/" />
+	<test url="http://secure.ecs.soton.ac.uk/login/" />
+
 	<rule from="^http://(www\.)?jobs\.soton\.ac\.uk/"
 		to="https://$1jobs.soton.ac.uk/" />
 
+	<test url="http://www.jobs.soton.ac.uk/display.aspx?Id=1253&amp;pid=0" />
+
 	<!--	Cert is not valid for !www.
 						-->
 	<rule from="^http://(?:www\.)?noc\.soton\.ac\.uk/"
