From 392c3e6ac0edfd8aa9c5de3049db74b6c8b9acb6 Mon Sep 17 00:00:00 2001 From: jowi Date: Wed, 18 May 2016 00:07:28 +0200 Subject: [PATCH 1/3] update Flickr rules --- src/chrome/content/rules/Flickr.net.xml | 7 +-- src/chrome/content/rules/Flickr.xml | 59 ++++++++++++++++++------- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/src/chrome/content/rules/Flickr.net.xml b/src/chrome/content/rules/Flickr.net.xml index 0b328395dc84..0a6dce3c1375 100644 --- a/src/chrome/content/rules/Flickr.net.xml +++ b/src/chrome/content/rules/Flickr.net.xml @@ -2,10 +2,7 @@ For other Yahoo coverage, see Yahoo.xml. - These altnames don't exist: - - - www.blog.flickr.net - - www.code.flickr.net + Timeout on (www.) Insecure cookies are set for these domains: @@ -15,8 +12,6 @@ --> - diff --git a/src/chrome/content/rules/Flickr.xml b/src/chrome/content/rules/Flickr.xml index 87bd31c00395..06995eb8b867 100644 --- a/src/chrome/content/rules/Flickr.xml +++ b/src/chrome/content/rules/Flickr.xml @@ -2,17 +2,14 @@ For other Yahoo coverage, see Yahoo.xml. - Fully covered hosts in *flickr.com: + Mismatch: + - parkorbird.flickr.com - - (www.)? - - api - - secure - - static + Timeout: + - blog.flickr.com (blog.flickr.net) - - *.static: - - c\d+ - - farm\d+ + (www.)staticflickr.com does not exist Insecure cookies are set for these domains and hosts: @@ -28,27 +25,57 @@ --> - + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + From fe0dbfd0d7c347b5e6a8fbec94e6c2fd6a9010d2 Mon Sep 17 00:00:00 2001 From: jowi Date: Wed, 18 May 2016 00:25:10 +0200 Subject: [PATCH 2/3] fixed duped host --- src/chrome/content/rules/Flickr.xml | 22 ------------ .../content/rules/Static_Flickr.com.xml | 35 +++++++++++-------- 2 files changed, 20 insertions(+), 37 deletions(-) diff --git a/src/chrome/content/rules/Flickr.xml b/src/chrome/content/rules/Flickr.xml index 06995eb8b867..a503fe7d8bd4 100644 --- a/src/chrome/content/rules/Flickr.xml +++ b/src/chrome/content/rules/Flickr.xml @@ -9,9 +9,6 @@ - blog.flickr.com (blog.flickr.net) - (www.)staticflickr.com does not exist - - Insecure cookies are set for these domains and hosts: - .flickr.com @@ -34,7 +31,6 @@ - @@ -46,24 +42,6 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Static_Flickr.com.xml b/src/chrome/content/rules/Static_Flickr.com.xml index ba200a382e49..c11a75f55f8b 100644 --- a/src/chrome/content/rules/Static_Flickr.com.xml +++ b/src/chrome/content/rules/Static_Flickr.com.xml @@ -1,26 +1,31 @@ - + - - - - - + + + + + + + + + + + + + + + + + + From 340552b0ffbf90777baacbf7970c33d171f9e3dc Mon Sep 17 00:00:00 2001 From: jowi Date: Wed, 18 May 2016 00:25:57 +0200 Subject: [PATCH 3/3] enable ruleset coverage test for Flickr --- utils/ruleset-coverage-whitelist.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/utils/ruleset-coverage-whitelist.txt b/utils/ruleset-coverage-whitelist.txt index 90000eda51a1..83c603922d5c 100644 --- a/utils/ruleset-coverage-whitelist.txt +++ b/utils/ruleset-coverage-whitelist.txt @@ -4530,7 +4530,6 @@ ef6c2187d795339cc2fab6360e0a5355989bc99492276d720e93efbe839e6116 Flattr.xml a5c8c5ba70eda4fdc1061070ffd012a1aadb8396d80a344b11520bc621d263d1 Flavors.me.xml 16a442961bc605df07d71876f69be34cb50a938f5d2698cbdb4acc48a2ed15fa Fleet_Networks.xml 2d64a92351f88b1626a7af92eef7ff204f559c9ef1269c42624e09c8aaa32ef7 Flex_Investments.xml -677b58f1b9b71ca5ac7272a5f6efd10a84bea7fdbcd0dd8e19184cd43a4360ef Flickr.xml 24c376a5a6786a98a3db5e7ebaf5e9463ee06bedeca597813a3cff769bd69bbc Flightaware.xml 141e304897274ec623b1c8f6851f4bd98a130a544bb0b1069fc51c5a79f92287 Flightglobal-mismatches.xml 3937752f7e787aed21ab503da7978461734f5b5bc2886712dcca57bce9519d5b Flightglobal.xml @@ -11859,7 +11858,6 @@ cbb59c8fb32a2a5ea0cf3b3fd7d70b6add8a46094a11757de3c678d5e61aeb3d State_of_Orego f41ae69f3061e7a3dfcad76556a1086b3abe97b07d6fbb045e8f49784022420d Staticmy.com.xml f2bf554fa7c1e2e42482d4f3e1f91ea03ca89ff20c3e480c40f24f90c4881c0c Staticskynet.be.xml 5c9829129baf195a9dbfac286a509c36e0e41bb8adafa18e9162034a65c19904 StaticWars.com.xml -1a4cddec6dc0af7b913a5ffa4db2cf946227fcc23a45a1cff1f852076cd2da66 Static_Flickr.com.xml 7500f592127c32a25e139992a6e1e067e488031164d9d8ba29173471e81d26e1 Static_Site_Generators.net.xml a9403952ebc8d7fdaa783d9987719a614a9c97ced2dfbd137fa3eda9ad8c0f4c Station_L_Rowing_Club.xml bf1bf4c8f4a9d2709a7f64e25ec4c5e28359bf3233b9fc06ba42a638f3eb0968 StatistikamtBayern.xml