Skip to content

Commit f4f980a

Browse files
J0WIJ0WI
authored
Merge pull request EFForg#17117 from cschanaj/intel.co.uk
Update Intel.xml and Intel.co.uk.xml
2 parents 1758168 + ff87b65 commit f4f980a

File tree

3 files changed

+10
-124
lines changed

3 files changed

+10
-124
lines changed

‎src/chrome/content/rules/Intel-mismatches.xml‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/chrome/content/rules/Intel.co.uk.xml‎

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,13 @@
11
<!--
22
For other Intel coverage, see Intel.xml.
33
4-
5-
Problematic subdomains:
6-
7-
- iq *
8-
9-
* Mixed css
10-
11-
12-
These altnames don't exist:
13-
14-
- www.iq.intel.co.uk
15-
16-
17-
Mixed content:
18-
19-
- css on iq from $self *
20-
21-
* Secured by us
22-
4+
Non-functional hosts
5+
Couldn't connect to server:
6+
- intel.co.uk
237
-->
248
<ruleset name="Intel.co.uk (partial)">
25-
269
<target host="iq.intel.co.uk" />
27-
<!--
28-
Avoid broken MCB:
29-
-->
30-
<exclusion pattern="^http://iq\.intel\.co\.uk/+(?!favicon\.ico|wp-content/|wp-includes/)" />
31-
10+
<target host="www.intel.co.uk" />
3211

3312
<rule from="^http:" to="https:" />
34-
3513
</ruleset>

‎src/chrome/content/rules/Intel.xml‎

Lines changed: 6 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<!--
2-
For problematic rules, see Intel-mismatches.xml.
3-
42
CDN buckets:
53
- corpredirect.intel.com.edgesuite.net
64
- downloadmirror.intel.com.edgesuite.net
@@ -73,15 +71,13 @@
7371
- downloadcenter
7472
- downloads-software
7573
- jira.hppd
76-
- appcenter.html5tools-software
7774
- origin-software
7875
- registrationcenter
7976
- secure-software
8077
- sfederation
8178
- signin
8279
- software
8380
- xdk (→ software.intel.com)
84-
- download.xdk
8581
8682
Observed cookie domains:
8783
- communities
@@ -124,6 +120,8 @@
124120

125121
<!-- Direct rewrites:
126122
-->
123+
<target host="intel.com" />
124+
<target host="www.intel.com" />
127125
<target host="ark.intel.com" />
128126
<target host="blogs.intel.com" />
129127
<target host="click.intel.com" />
@@ -135,88 +133,26 @@
135133
<target host="edc.intel.com" />
136134
<target host="educate.intel.com" />
137135
<target host="engage.intel.com" />
136+
<target host="failover.intel.com" />
137+
<test url="http://failover.intel.com/failover/www.intel.com/Assets/contact-numbers.pdf" />
138138
<target host="freepress.intel.com" />
139-
<target host="appcenter.html5tools-software.intel.com" />
140139
<target host="newsroom.intel.com" />
141140
<target host="registrationcenter.intel.com" />
142141
<target host="software.intel.com" />
143142
<target host="origin-software.intel.com" />
144143
<target host="sfederation.intel.com" />
145144
<target host="signin.intel.com" />
146-
<!-- Fails travis-ci
147-
target host="staging-blogs.intel.com" /-->
145+
<target host="staging-blogs.intel.com" />
148146
<target host="www-ssl.intel.com" />
149-
<target host="download.xdk.intel.com" />
150147

151148
<!-- Complications:
152149
-->
153-
<target host="intel.com" />
154-
<target host="embedded.edc.intel.com" />
155-
<target host="www.intel.com" />
156150
<target host="xdk.intel.com" />
157151

158-
<!-- https://lists.eff.org/pipermail/https-everywhere-rules/2013-November/001732.html
159-
-->
160-
<!--exclusion pattern="^http://www\.intel\.com/newsroom/assets/bio/" /-->
161-
<!--
162-
Without these, there would be mixed content on newsroom:
163-
-->
164-
<exclusion pattern="^http://(?:www\.)?intel\.com/(?!content/|etc/|favicon\.ico|newsroom/assets/(?!bio/)|sites/)" />
165-
166-
<!-- +ve: -->
167-
<test url="http://www.intel.com/apac/" />
168-
<test url="http://www.intel.com/espanol/" />
169-
<test url="http://www.intel.com/facebook" />
170-
<test url="http://www.intel.com/p/en_US/support" />
171-
<test url="http://www.intel.com/p/en_US/support/detect" />
172-
<test url="http://www.intel.com/video/" />
173-
174-
<!-- -ve: -->
175-
<test url="http://www.intel.com/etc/designs/intel/us/en/images/share-icons.png" />
176-
<test url="http://www.intel.com/favicon.ico" />
177-
<test url="http://www.intel.com/newsroom/assets/images/nr-view-more-sub-small-mrq.png" />
178-
<test url="http://www.intel.com/newsroom/assets/tab/prTab.css" />
179-
<test url="http://www.intel.com/sites/sitewide/HAT/50recode/pix/main-logo.png" />
180-
181-
<!-- Avoid false/broken MCB:
182-
-->
183-
<exclusion pattern="^http://newsroom\.intel\.com/+(?!favicon\.ico|(?:\d\.\d\.\d/)?(?:images/|plugins/|styles/|themes?/)|people/\w+/avatar/)" />
184-
<!-- +ve: -->
185-
<test url="http://newsroom.intel.com/archive.jspa" />
186-
<test url="http://newsroom.intel.com/communications" />
187-
<test url="http://newsroom.intel.com/community/intel_newsroom" />
188-
<test url="http://newsroom.intel.com/community/intel_newsroom/bios" />
189-
<test url="http://newsroom.intel.com/community/intel_newsroom/contact_pr" />
190-
<test url="http://newsroom.intel.com/community/intel_newsroom/create-account.jspa" />
191-
<test url="http://newsroom.intel.com/community/intel_newsroom/login.jspa" />
192-
<test url="http://newsroom.intel.com/create-account.jspa" />
193-
<test url="http://newsroom.intel.com/docs/DOC-6309" />
194-
<test url="http://newsroom.intel.com/people" />
195-
<!-- -ve: -->
196-
<test url="http://newsroom.intel.com/5.0.2/images/steelhead/j-ui-sprite.png" />
197-
<test url="http://newsroom.intel.com/5.0.2/styles/jive-icons.css" />
198-
<test url="http://newsroom.intel.com/favicon.ico" />
199-
<test url="http://newsroom.intel.com/images/jive-image-loading.gif" />
200-
<test url="http://newsroom.intel.com/people/guest/avatar/40.png" />
201-
<test url="http://newsroom.intel.com/plugins/event-type-plugin/resources/styles/event.css" />
202-
<test url="http://newsroom.intel.com/theme/white/styles/theme.css" />
203-
<test url="http://newsroom.intel.com/themes/intel-ipr/images/bg-gradient.png" />
204-
205-
<securecookie host=".+\.intel\.com$" name=".+" />
206-
207-
<rule from="^http://(?:www\.)?intel\.com/"
208-
to="https://www-ssl.intel.com/" />
152+
<securecookie host=".+" name=".+" />
209153

210154
<!-- Redirects like so:
211155
-->
212-
<rule from="^http://embedded\.edc\.intel\.com/+(?:$|\?.*)"
213-
to="https://embedded.communities.intel.com/" />
214-
215-
<test url="http://embedded.edc.intel.com/?f" />
216-
<test url="http://embedded.edc.intel.com/?o" />
217-
<test url="http://embedded.edc.intel.com//?o" />
218-
<test url="http://embedded.edc.intel.com/?b" />
219-
220156
<rule from="^http://xdk\.intel\.com/$"
221157
to="https://software.intel.com/en-us/intel-xdk" />
222158

0 commit comments

Comments
 (0)