From d737b46efc4d79de22eb34d2852869c9410eb56c Mon Sep 17 00:00:00 2001
From: Bastian Bringenberg <bastian@agentur-pottkinder.de>
Date: Sat, 8 Apr 2017 23:02:02 +0200
Subject: [PATCH 1/2] Update TYPO3 Rules

Removing Neos and FLOW from List and removing some settings that are from the past.
---
 src/chrome/content/rules/TYPO3.xml | 93 +-----------------------------
 1 file changed, 2 insertions(+), 91 deletions(-)

diff --git a/src/chrome/content/rules/TYPO3.xml b/src/chrome/content/rules/TYPO3.xml
index e089203f056f..8b1d4fcf839d 100644
--- a/src/chrome/content/rules/TYPO3.xml
+++ b/src/chrome/content/rules/TYPO3.xml
@@ -1,114 +1,25 @@
 <!--
-	For rules causing false/broken MCB, see TYPO3.org-falsemixed.xml.
-
-	Other TYPO3 rulesets:
-
-		- T3Blog.com.xml
-
-
 	Nonfunctional hosts in *typo3.org:
-
-		- demo ¹
-		- lists ²
-
-	¹ Dropped
-	² Refused
-
-
-	Problematic hosts in *typo3.org:
-
-		- flow ¹
-		- neos ²
-
-	¹ Mixed css from $self
-	² Mismatched
-
-
-	Insecure cookies are set for these domains and hosts:
-
-		- .typo3.org
-		- buzz.typo3.org
-		- forge.typo3.org
-		- .forum.typo3.org
-
-
-	Mixed content:
-
-		- css on flow from $self *
-		- Images flow from $self *
-		- favicon on buzz, flow from $self *
-		- Bug on ^, buzz, forum, wiki from piwik.typo3.org *
-
-	⁴ Secured by us
-
+		- lists
 -->
 <ruleset name="TYPO3.org (partial)">
 
 	<!--	Direct rewrites:
 				-->
 	<target host="typo3.org"/>
-	<target host="association.typo3.org" />
 	<target host="buzz.typo3.org" />
-	<target host="certification.typo3.org" />
 	<target host="composer.typo3.org" />
 	<target host="docs.typo3.org" />
-	<target host="flow.typo3.org" />
 	<target host="forge.typo3.org" />
 	<target host="forum.typo3.org" />
 	<target host="get.typo3.org" />
 	<target host="git.typo3.org" />
 	<target host="piwik.typo3.org" />
 	<target host="review.typo3.org" />
-	<target host="shop.typo3.org" />
 	<target host="wiki.typo3.org" />
 	<target host="www.typo3.org" />
 
-	<!--	Complications:
-				-->
-	<target host="neos.typo3.org" />
-
-		<exclusion pattern="^http://flow\.typo3\.org/+(?!_Resources/)" />
-
-			<!--	+ve:
-					-->
-			<test url="http://flow.typo3.org/community" />
-			<test url="http://flow.typo3.org/home" />
-			<test url="http://flow.typo3.org/support" />
-
-			<!--	-ve:
-					-->
-			<test url="http://flow.typo3.org/_Resources/Static/Packages/TYPO3.FlowTypo3Org/Stylesheets/print.css" />
-
-		<!--	Formerly triggered broken MCB:
-							-->
-		<test url="http://docs.typo3.org/getthedocs/" />
-		<test url="http://docs.typo3.org/typo3cms/" />
-		<test url="http://docs.typo3.org/typo3cms/CoreApiReference/" />
-		<test url="http://docs.typo3.org/typo3cms/Index.html" />
-		<test url="http://docs.typo3.org/typo3cms/InstallationGuide/" />
-		<test url="http://docs.typo3.org/typo3cms/SecurityGuide/" />
-		<test url="http://docs.typo3.org/typo3cms/TyposcriptSyntaxReference/" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^\.typo3\.org$" name="^fe_typo_user$" /-->
-	<!--securecookie host="^buzz\.typo3\.org$" name="^fe_typo_user$" /-->
-	<!--securecookie host="^forge\.typo3\.org$" name="^_redmine_session$" /-->
-	<!--securecookie host="^\.forum\.typo3\.org$" name="^fud_session_\d+$" /-->
-
 	<securecookie host="^\." name="^fe_typo_user$" />
-	<securecookie host="^(?!flow\.)." name="." />
-
-
-	<!--	Redirect keeps path and args,
-		but not forward slash:
-					-->
-	<rule from="^http://neos\.typo3\.org/+"
-		to="https://www.neos.io/" />
-
-		<test url="http://neos.typo3.org//" />
 
-	<rule from="^http:"
-		to="https:" />
+	<rule from="^http:"	to="https:" />
 </ruleset>

From c4c60df0947b7935d232091144450611452b4719 Mon Sep 17 00:00:00 2001
From: Bastian Bringenberg <bastian@agentur-pottkinder.de>
Date: Sat, 8 Apr 2017 23:04:09 +0200
Subject: [PATCH 2/2] Delete TYPO3.org-falsemixed.xml

Remove old flow host.
---
 src/chrome/content/rules/TYPO3.org-falsemixed.xml | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 src/chrome/content/rules/TYPO3.org-falsemixed.xml

diff --git a/src/chrome/content/rules/TYPO3.org-falsemixed.xml b/src/chrome/content/rules/TYPO3.org-falsemixed.xml
deleted file mode 100644
index 82068e1645ae..000000000000
--- a/src/chrome/content/rules/TYPO3.org-falsemixed.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!--
-	For rules not causing false/broken MCB, see TYPO3.xml.
-
--->
-<ruleset name="TYPO3.org (false MCB)" platform="mixedcontent">
-
-	<target host="flow.typo3.org" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>