[Qxl] Don't force www, squish, add comments, add tests, split, cosmetics

MB · MB · commit e510f46bfed4 · 2015-12-13T22:00:00.000Z
diff --git a/src/chrome/content/rules/QXL.dk.xml b/src/chrome/content/rules/QXL.dk.xml
@@ -0,0 +1,30 @@
+<!--
+	For other QXL coverage, see Qxl.xml.
+
+
+	Nonfunctional hosts in qxl.dk:
+
+		- hjaelp *
+		
+	* Handshake fails
+
+-->
+<ruleset name="QXL.dk">
+
+	<!--	Direct rewrites:
+				-->
+	<target host="qxl.dk" />
+	<target host="www.qxl.dk" />
+
+
+	<!--	Not secured by server:
+					-->
+	<!--ssecurecookie host="^\.qxl\.dk$" name="^NbResult$" /-->
+
+	<securecookie host="^\w" name="." />
+
+
+	<rule from="^http:"
+		to="https:"/>
+</ruleset>
+
diff --git a/src/chrome/content/rules/Qxl.xml b/src/chrome/content/rules/Qxl.xml
@@ -1,10 +1,48 @@
-<ruleset name="Qxl" platform="mixedcontent">
-  <target host="qxl.no" />
-  <target host="www.qxl.no" />
-  <target host="qxl.dk" />
-  <target host="www.qxl.dk" />
-
-  <rule from="^http://(?:www\.)?qxl\.no/" to="https://www.qxl.no/"/>
-  <rule from="^http://(?:www\.)?qxl\.dk/" to="https://www.qxl.dk/"/>
+<!--
+	Other QXL rulesets:
+
+		- QXL.dk.xml
+
+
+	Nonfunctional hosts in qxl.no:
+
+		- hjelp *
+
+	* Handshake fails
+
+
+	Mixed content:
+
+		- Images, on:
+
+			- auksjon.qxl.no, www.qxl.no from www.qxl.no *
+			- auksjon.qxl.no, www.qxl.no from pics.qxlstatic.no
+			- auksjon.qxl.no from www.ricardo.ch *
+
+	* Secured by us
+
+-->
+<ruleset name="Qxl.no (partial)">
+
+	<!--	Direct rewrites:
+				-->
+	<target host="qxl.no" />
+	<target host="auksjon.qxl.no" />
+	<target host="www.qxl.no" />
+
+		<!--	Mixed images:
+					-->
+		<test url="http://www.qxl.no/pris/" />
+
+
+	<!--	Not secured by server:
+					-->
+	<!--securecookie host="^\.qxl\.no$" name="^NbResult$" /-->
+
+	<securecookie host="^\w" name="." />
+
+
+	<rule from="^http:"
+		to="https:"/>
 </ruleset>
 
