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

Side by Side Diff: modules/filterserver/files/site.conf

Issue 29419604: Noissue - Do not redirect modern ABB versions to noelemhide filters (Closed) Base URL: https://hg1/infrastructure
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:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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;
(...skipping 18 matching lines...) Expand all
29 if ($arg_addonName ~ ^(adblockplusie)$) 29 if ($arg_addonName ~ ^(adblockplusie)$)
30 { 30 {
31 set $use_alternative_resource_flags "IE"; 31 set $use_alternative_resource_flags "IE";
32 } 32 }
33 33
34 if ($arg_application ~ ^(yowser|adblockbrowser)$) 34 if ($arg_application ~ ^(yowser|adblockbrowser)$)
35 { 35 {
36 set $use_alternative_resource_flags "BROWSER"; 36 set $use_alternative_resource_flags "BROWSER";
37 } 37 }
38 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 }
44
39 if ($arg_addonName = "libadblockplus-android") 45 if ($arg_addonName = "libadblockplus-android")
40 { 46 {
41 set $use_alternative_resource_flags "ZTE"; 47 set $use_alternative_resource_flags "ZTE";
42 } 48 }
43 49
44 if ($geoip_country_code = "DE") 50 if ($geoip_country_code = "DE")
45 { 51 {
46 set $use_alternative_resource_flags "${use_alternative_resource_flags}+LOCATIO N"; 52 set $use_alternative_resource_flags "${use_alternative_resource_flags}+LOCATIO N";
47 } 53 }
48 54
49 if ($use_alternative_resource_flags = "BROWSER+LOCATION") 55 if ($use_alternative_resource_flags = "BROWSER+LOCATION")
50 { 56 {
51 rewrite ^/easylist\.(.+) /easylist_noelemhide.$1 redirect; 57 rewrite ^/easylist\.(.+) /easylist_noelemhide.$1 redirect;
52 rewrite ^/easylistgermany\+easylist\.(.+) /easylistgermany_noelemhide+easylist _noelemhide.$1 redirect; 58 rewrite ^/easylistgermany\+easylist\.(.+) /easylistgermany_noelemhide+easylist _noelemhide.$1 redirect;
53 rewrite ^/easylistgermany\.(.+) /easylistgermany_noelemhide.$1 redirect; 59 rewrite ^/easylistgermany\.(.+) /easylistgermany_noelemhide.$1 redirect;
54 } 60 }
55 61
56 if ($use_alternative_resource_flags = "IE+LOCATION") 62 if ($use_alternative_resource_flags = "IE+LOCATION")
57 { 63 {
58 rewrite ^/easylist\.(.+) /easylist_noelemhide.$1 break; 64 rewrite ^/easylist\.(.+) /easylist_noelemhide.$1 break;
59 rewrite ^/easylistgermany\+easylist\.(.+) /easylistgermany_noelemhide+easylist _noelemhide.$1 break; 65 rewrite ^/easylistgermany\+easylist\.(.+) /easylistgermany_noelemhide+easylist _noelemhide.$1 break;
60 rewrite ^/easylistgermany\.(.+) /easylistgermany_noelemhide.$1 break; 66 rewrite ^/easylistgermany\.(.+) /easylistgermany_noelemhide.$1 break;
61 } 67 }
62 68
63 if ($use_alternative_resource_flags = "ZTE") 69 if ($use_alternative_resource_flags = "ZTE")
64 { 70 {
65 rewrite ^/exceptionrules\.(.+) /exceptionrules-minimal.$1 break; 71 rewrite ^/exceptionrules\.(.+) /exceptionrules-minimal.$1 break;
66 } 72 }
67 73
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld