Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: modules/filterserver/files/site.conf

Issue 29419604: Noissue - Do not redirect modern ABB versions to noelemhide filters (Closed) Base URL: https://hg1/infrastructure
Left Patch Set: improve regexp with escaped dot Created April 21, 2017, 1:20 p.m.
Right Patch Set: improve regexp Created April 21, 2017, 3:14 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 root /var/www/easylist; 1 root /var/www/easylist;
2 keepalive_timeout 0; 2 keepalive_timeout 0;
3 charset utf-8; 3 charset utf-8;
4 gzip_static on; 4 gzip_static on;
5 default_type text/plain; 5 default_type text/plain;
6 6
7 # http://hub.eyeo.com/issues/262 7 # http://hub.eyeo.com/issues/262
8 location /filters/easylist-min.txt 8 location /filters/easylist-min.txt
9 { 9 {
10 proxy_cache filters; 10 proxy_cache filters;
11 proxy_cache_key $uri; 11 proxy_cache_key $uri;
12 proxy_cache_lock on; 12 proxy_cache_lock on;
13 proxy_cache_revalidate on; 13 proxy_cache_revalidate on;
14 proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504; 14 proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504;
15 proxy_cache_valid any 60m; 15 proxy_cache_valid any 60m;
16 proxy_hide_header Content-Disposition; 16 proxy_hide_header Content-Disposition;
17 proxy_pass https://cdn.adblockcdn.com; 17 proxy_pass https://cdn.adblockcdn.com;
18 } 18 }
19 19
20 ### http://hub.eyeo.com/issues/444 for ZTE redirects 20 ### http://hub.eyeo.com/issues/444 for ZTE redirects
21 ### http://hub.eyeo.com/issues/496 for bento.de redirects 21 ### http://hub.eyeo.com/issues/496 for bento.de redirects
22 set $use_alternative_resource_flags 0; 22 set $use_alternative_resource_flags 0;
23 23
24 if ($arg_addonName ~ ^([Mm]axthon)$) 24 if ($arg_addonName ~ ^([Mm]axthon)$)
25 { 25 {
26 set $use_alternative_resource_flags "BROWSER"; 26 set $use_alternative_resource_flags "BROWSER";
27 } 27 }
28 28
29 ### http://hub.eyeo.com/issues/735 Hack for ABB development build that supports elemhide:
30 if ($arg_addonVersion ~ ^(2\.)(7|8|9)($|\.).*$)
31 {
32 set $use_alternative_resource_flags "${use_alternative_resource_flags}+SUPPORT S_ELEMHIDE";
33 }
34
35 if ($arg_addonName ~ ^(adblockplusie)$) 29 if ($arg_addonName ~ ^(adblockplusie)$)
36 { 30 {
37 set $use_alternative_resource_flags "IE"; 31 set $use_alternative_resource_flags "IE";
38 } 32 }
39 33
40 if ($arg_application ~ ^(yowser|adblockbrowser)$) 34 if ($arg_application ~ ^(yowser|adblockbrowser)$)
41 { 35 {
42 set $use_alternative_resource_flags "BROWSER"; 36 set $use_alternative_resource_flags "BROWSER";
37 }
38
39 ### http://hub.eyeo.com/issues/735 Hack for ABB development build that supports elemhide:
40 if ($arg_addonVersion ~ ^2\.(7|8|9)(\..*)?$)
41 {
42 set $use_alternative_resource_flags "${use_alternative_resource_flags}+SUPPORT S_ELEMHIDE";
43 } 43 }
44 44
45 if ($arg_addonName = "libadblockplus-android") 45 if ($arg_addonName = "libadblockplus-android")
46 { 46 {
47 set $use_alternative_resource_flags "ZTE"; 47 set $use_alternative_resource_flags "ZTE";
48 } 48 }
49 49
50 if ($geoip_country_code = "DE") 50 if ($geoip_country_code = "DE")
51 { 51 {
52 set $use_alternative_resource_flags "${use_alternative_resource_flags}+LOCATIO N"; 52 set $use_alternative_resource_flags "${use_alternative_resource_flags}+LOCATIO N";
(...skipping 11 matching lines...) Expand all
64 rewrite ^/easylist\.(.+) /easylist_noelemhide.$1 break; 64 rewrite ^/easylist\.(.+) /easylist_noelemhide.$1 break;
65 rewrite ^/easylistgermany\+easylist\.(.+) /easylistgermany_noelemhide+easylist _noelemhide.$1 break; 65 rewrite ^/easylistgermany\+easylist\.(.+) /easylistgermany_noelemhide+easylist _noelemhide.$1 break;
66 rewrite ^/easylistgermany\.(.+) /easylistgermany_noelemhide.$1 break; 66 rewrite ^/easylistgermany\.(.+) /easylistgermany_noelemhide.$1 break;
67 } 67 }
68 68
69 if ($use_alternative_resource_flags = "ZTE") 69 if ($use_alternative_resource_flags = "ZTE")
70 { 70 {
71 rewrite ^/exceptionrules\.(.+) /exceptionrules-minimal.$1 break; 71 rewrite ^/exceptionrules\.(.+) /exceptionrules-minimal.$1 break;
72 } 72 }
73 73
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld