From 5b0321d74e79bc32ba8600f088324962b9cca8f5 Mon Sep 17 00:00:00 2001
From: youdly <youdly@users.noreply.github.com>
Date: Sat, 23 Jun 2018 16:18:18 +0930
Subject: [PATCH 1/2] [STA Travel.co.nz] New ruleset

---
 src/chrome/content/rules/STA-Travel.co.nz.xml | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 src/chrome/content/rules/STA-Travel.co.nz.xml

diff --git a/src/chrome/content/rules/STA-Travel.co.nz.xml b/src/chrome/content/rules/STA-Travel.co.nz.xml
new file mode 100644
index 000000000000..1a31067d9ee2
--- /dev/null
+++ b/src/chrome/content/rules/STA-Travel.co.nz.xml
@@ -0,0 +1,43 @@
+<!--
+	For other coverage, see STA-Travel.com.xml
+
+
+	Non-functional subdomains:
+		- $host	(t)
+		- flight	(t)
+		- grouptravel	(m)
+		- insurance	(e)
+		- m	(m)
+		- vpn	(i)
+		- ww3	(ssl connection error)
+		- ww4	(e)
+
+	e: expired certificate
+	h: http redirect
+	i: invalid certificate chain
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+<ruleset name="STA Travel.co.nz">
+
+	<target host="statravel.co.nz" />
+	<target host="www.statravel.co.nz" />
+	<target host="book.statravel.co.nz" />
+	<target host="cheap-car-rental.statravel.co.nz" />
+	<target host="g.statravel.co.nz" />
+	<target host="locations.statravel.co.nz" />
+	<target host="rail.statravel.co.nz" />
+	<target host="tours.statravel.co.nz" />
+	<target host="win.statravel.co.nz" />
+	<target host="www.win.statravel.co.nz" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http://statravel\.co\.nz/"
+		to="https://www.statravel.co.nz/" />
+
+	<rule from="^http:"
+		to="https:" />
+</ruleset>

From d9925e6b1c682d03bf2ed5a88ff57be87d63bf3e Mon Sep 17 00:00:00 2001
From: youdly <youdly@users.noreply.github.com>
Date: Tue, 26 Jun 2018 17:12:53 +0930
Subject: [PATCH 2/2] Add exclusion for problematic directory

---
 src/chrome/content/rules/STA-Travel.co.nz.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/chrome/content/rules/STA-Travel.co.nz.xml b/src/chrome/content/rules/STA-Travel.co.nz.xml
index 1a31067d9ee2..83ead9f632cb 100644
--- a/src/chrome/content/rules/STA-Travel.co.nz.xml
+++ b/src/chrome/content/rules/STA-Travel.co.nz.xml
@@ -30,11 +30,16 @@
 	<target host="locations.statravel.co.nz" />
 	<target host="rail.statravel.co.nz" />
 	<target host="tours.statravel.co.nz" />
+		<test url="http://tours.statravel.co.nz/content/images/icon-cal-small.png" />
 	<target host="win.statravel.co.nz" />
 	<target host="www.win.statravel.co.nz" />
 
 	<securecookie host=".+" name=".+" />
 
+	<!-- http redirect -->
+	<exclusion pattern="^http://www\.statravel\.co\.nz/tours" />
+		<test url="http://www.statravel.co.nz/tours.htm" />
+
 	<rule from="^http://statravel\.co\.nz/"
 		to="https://www.statravel.co.nz/" />