Unified Diff: modules/filterserver/files/site.conf
Issue 29789575:
#10517 - Update filter redirects for ZTE UME (Closed)
Patch Set: Use better naming and avoid abbreviation
Created May 28, 2018, 11:53 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/filterserver/files/site.conf |
| =================================================================== |
| --- a/modules/filterserver/files/site.conf |
| +++ b/modules/filterserver/files/site.conf |
| @@ -44,13 +44,7 @@ |
| if ($arg_addonName = "libadblockplus-android") |
| { |
| - set $use_alternative_resource_flags "ZTE"; |
| -} |
| - |
| -# http://hub.eyeo.com/issues/1374 |
| -if ($arg_application = "com.ume.browser.global") |
| -{ |
| - set $use_alternative_resource_flags "${use_alternative_resource_flags}+UME"; |
| + set $use_alternative_resource_flags "LIBABP_ANDROID"; |
| } |
| if ($geoip_country_code = "DE") |
| @@ -58,10 +52,12 @@ |
| set $use_alternative_resource_flags "${use_alternative_resource_flags}+LOCATION"; |
| } |
| +# http://hub.eyeo.com/issues/1374 |
| # http://hub.eyeo.com/issues/10493 |
| -if ($arg_application = "com.microsoft.emmx") |
| +# http://hub.eyeo.com/issues/10517 |
| +if ($arg_application ~ (com\.microsoft\.emmx|com\.ume\.browser\.global)) |
| { |
| - set $use_alternative_resource_flags "${use_alternative_resource_flags}+MSF"; |
| + set $use_alternative_resource_flags "${use_alternative_resource_flags}+MIN"; |
| } |
| ### http://hub.eyeo.com/issues/3924 for Chinese SBrowser video exceptions (1/4) |
| @@ -96,23 +92,8 @@ |
| rewrite ^/easylistgermany\.(.+) /easylistgermany_noelemhide.$1 break; |
| } |
| -if ($use_alternative_resource_flags = "ZTE") |
| -{ |
| - rewrite ^/exceptionrules\.(.+) /exceptionrules-minimal.$1 break; |
| -} |
| - |
| -if ($use_alternative_resource_flags = "ZTE+UME") |
| -{ |
| - rewrite ^/exceptionrules\.(.+) /exceptionrules-minimal.$1 break; |
| - rewrite ^/easylist\.(.+) /easylist-minimal.$1 break; |
| - rewrite ^/easylistchina\.(.+) /easylistchina-minimal.$1 break; |
| - rewrite ^/advblock\.(.+) /advblock-minimal.$1 break; |
| - rewrite ^/easylistchina\+easylist\.(.+) /easylistchina-minimal+easylist-minimal.$1 break; |
| - rewrite ^/ruadlist\+easylist\.(.+) /ruadlist-minimal+easylist-minimal.$1 break; |
| -} |
| - |
| # http://hub.eyeo.com/issues/10493 |
| -if ($use_alternative_resource_flags = "ZTE+MSF") |
| +if ($use_alternative_resource_flags ~ (LIBABP_ANDROID|LIBABP_ANDROID+MIN)) |
| { |
| rewrite ^/exceptionrules\.(.+) /exceptionrules-minimal.$1 break; |
| rewrite ^/easylist\.(.+) /easylist-minified.$1 break; |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
