Skip to content

Commit 89ca280

Browse files
author
MB
committed
[TYPO3] Merge docs, update comment, squish, cosmetics
1 parent d0c71ac commit 89ca280

2 files changed

Lines changed: 15 additions & 24 deletions

File tree

src/chrome/content/rules/TYPO3.org-falsemixed.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
-->
55
<ruleset name="TYPO3.org (false MCB)" platform="mixedcontent">
66

7-
<target host="docs.typo3.org" />
87
<target host="flow.typo3.org" />
98

109

src/chrome/content/rules/TYPO3.xml

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
- T3Blog.com.xml
77
88
9-
Nonfunctional subdomains:
9+
Nonfunctional hosts in *typo3.org:
1010
1111
- demo ¹
1212
- lists ²
@@ -15,9 +15,8 @@
1515
² Refused
1616
1717
18-
Problematic subdomains:
18+
Problematic hosts in *typo3.org:
1919
20-
- docs ¹
2120
- flow ¹
2221
- neos ²
2322
@@ -38,7 +37,7 @@
3837
- css on flow from $self *
3938
- Images flow from $self *
4039
- favicon on buzz, flow from $self *
41-
- Bug on ^, buzz, forum, wiki from wiki.typo3.org *
40+
- Bug on ^, buzz, forum, wiki from piwik.typo3.org *
4241
4342
⁴ Secured by us
4443
@@ -68,35 +67,28 @@
6867
-->
6968
<target host="neos.typo3.org" />
7069

71-
<!-- Avoid false/broken MCB:
72-
-->
73-
<exclusion pattern="^http://docs\.typo3\.org/+(?!css/|favicon\.ico|fonts/|i/|t3extras/)" />
7470
<exclusion pattern="^http://flow\.typo3\.org/+(?!_Resources/)" />
7571

7672
<!-- +ve:
7773
-->
78-
<test url="http://docs.typo3.org/getthedocs/" />
79-
<test url="http://docs.typo3.org/typo3cms/" />
80-
<test url="http://docs.typo3.org/typo3cms/CoreApiReference/" />
81-
<test url="http://docs.typo3.org/typo3cms/Index.html" />
82-
<test url="http://docs.typo3.org/typo3cms/InstallationGuide/" />
83-
<test url="http://docs.typo3.org/typo3cms/SecurityGuide/" />
84-
<test url="http://docs.typo3.org/typo3cms/TyposcriptSyntaxReference/" />
85-
8674
<test url="http://flow.typo3.org/community" />
8775
<test url="http://flow.typo3.org/home" />
8876
<test url="http://flow.typo3.org/support" />
8977

9078
<!-- -ve:
9179
-->
92-
<test url="http://docs.typo3.org/css/t3_to_be_integrated.css" />
93-
<test url="http://docs.typo3.org/favicon.ico" />
94-
<test url="http://docs.typo3.org/fonts/share-regular-webfont.woff" />
95-
<test url="http://docs.typo3.org/i/arrow-r-888888-17x17.png" />
96-
<test url="http://docs.typo3.org/t3extras/css/print.css" />
97-
9880
<test url="http://flow.typo3.org/_Resources/Static/Packages/TYPO3.FlowTypo3Org/Stylesheets/print.css" />
9981

82+
<!-- Formerly triggered broken MCB:
83+
-->
84+
<test url="http://docs.typo3.org/getthedocs/" />
85+
<test url="http://docs.typo3.org/typo3cms/" />
86+
<test url="http://docs.typo3.org/typo3cms/CoreApiReference/" />
87+
<test url="http://docs.typo3.org/typo3cms/Index.html" />
88+
<test url="http://docs.typo3.org/typo3cms/InstallationGuide/" />
89+
<test url="http://docs.typo3.org/typo3cms/SecurityGuide/" />
90+
<test url="http://docs.typo3.org/typo3cms/TyposcriptSyntaxReference/" />
91+
10092

10193
<!-- Not secured by server:
10294
-->
@@ -105,8 +97,8 @@
10597
<!--securecookie host="^forge\.typo3\.org$" name="^_redmine_session$" /-->
10698
<!--securecookie host="^\.forum\.typo3\.org$" name="^fud_session_\d+$" /-->
10799

108-
<securecookie host="^\.typo3\.org$" name="^fe_typo_user$" />
109-
<securecookie host="^(?:buzz|forge|\.forum)\.typo3\.org$" name=".+" />
100+
<securecookie host="^\." name="^fe_typo_user$" />
101+
<securecookie host="^(?!flow\.)." name="." />
110102

111103

112104
<!-- Redirect keeps path and args,

0 commit comments

Comments
 (0)