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

Delta Between Two Patch Sets: modules/web/templates/adblockplus.org.conf.erb

Issue 29754599: #10198 - Redirect abp.org/devbuilds to /development-builds (Closed)
Left Patch Set: Created April 17, 2018, 10:38 p.m.
Right Patch Set: For comment 2 and 3 Created April 17, 2018, 11:44 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 # XSS and clickjacking prevention headers 1 # XSS and clickjacking prevention headers
2 2
3 set $csp_frame ""; 3 set $csp_frame "";
4 if ($uri ~ ^/(:?\w\w(_\w\w)?/)?(?:index|firefox|chrome|opera|android|internet-ex plorer|safari|yandex-browser|maxthon)?$|^/blog/) 4 if ($uri ~ ^/(:?\w\w(_\w\w)?/)?(?:index|firefox|chrome|opera|android|internet-ex plorer|safari|yandex-browser|maxthon)?$|^/blog/)
5 { 5 {
6 set $csp_frame "; frame-src www.youtube-nocookie.com;"; 6 set $csp_frame "; frame-src www.youtube-nocookie.com;";
7 } 7 }
8 add_header Content-Security-Policy "default-src 'self'; img-src * data:; style-s rc 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' $csp_ frame"; 8 add_header Content-Security-Policy "default-src 'self'; img-src * data:; style-s rc 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' $csp_ frame";
9 add_header X-Frame-Options "sameorigin"; 9 add_header X-Frame-Options "sameorigin";
10 10
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 rewrite ^/(\w\w(_\w\w)?/)?changelog-1.3.1$ /$1\changelog-1.3 permanent; 81 rewrite ^/(\w\w(_\w\w)?/)?changelog-1.3.1$ /$1\changelog-1.3 permanent;
82 rewrite ^/downloads/(.*) https://downloads.adblockplus.org/$1 permanent; 82 rewrite ^/downloads/(.*) https://downloads.adblockplus.org/$1 permanent;
83 83
84 rewrite ^/update.rdf$ https://update.adblockplus.org/gecko/update.rdf permanent; 84 rewrite ^/update.rdf$ https://update.adblockplus.org/gecko/update.rdf permanent;
85 rewrite ^/updates.plist$ https://update.adblockplus.org/adblockplussafari/update s.plist permanent; 85 rewrite ^/updates.plist$ https://update.adblockplus.org/adblockplussafari/update s.plist permanent;
86 rewrite ^/androidupdate.json$ https://update.adblockplus.org/adblockplusandroid/ update.json permanent; 86 rewrite ^/androidupdate.json$ https://update.adblockplus.org/adblockplusandroid/ update.json permanent;
87 rewrite ^/androidupdates.xml$ https://update.adblockplus.org/adblockplusandroid/ updates.xml permanent; 87 rewrite ^/androidupdates.xml$ https://update.adblockplus.org/adblockplusandroid/ updates.xml permanent;
88 rewrite ^/ieupdate.json$ https://update.adblockplus.org/adblockplusie/update.jso n permanent; 88 rewrite ^/ieupdate.json$ https://update.adblockplus.org/adblockplusie/update.jso n permanent;
89 89
90 rewrite ^/(\w\w(_\w\w)?/)?adblock-browser/?$ https://adblockbrowser.org/ permane nt; 90 rewrite ^/(\w\w(_\w\w)?/)?adblock-browser/?$ https://adblockbrowser.org/ permane nt;
91 rewrite ^/(devbuilds)/?$ https://adblockplus.org/development-builds permanent; 91 rewrite ^/devbuilds/?$ https://adblockplus.org/development-builds permanent;
mathias 2018/04/17 22:49:51 Why the surrounding `()`? And shouldn't `/devbuild
92 92
93 location /redirect 93 location /redirect
94 { 94 {
95 set $adblock_browser_android_download "https://downloads.adblockplus.org/adblo ckbrowser-1.1.0-arm.apk"; 95 set $adblock_browser_android_download "https://downloads.adblockplus.org/adblo ckbrowser-1.1.0-arm.apk";
96 set $adblock_browser_android_store "https://play.google.com/store/apps/details ?id=org.adblockplus.browser"; 96 set $adblock_browser_android_store "https://play.google.com/store/apps/details ?id=org.adblockplus.browser";
97 97
98 set $lang "en"; 98 set $lang "en";
99 99
100 if ($arg_lang ~ ^(\w+)) 100 if ($arg_lang ~ ^(\w+))
101 { 101 {
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 location /403.html 317 location /403.html
318 { 318 {
319 try_files $uri @proxied; 319 try_files $uri @proxied;
320 } 320 }
321 location @proxied 321 location @proxied
322 { 322 {
323 proxy_pass https://server16.adblockplus.org; 323 proxy_pass https://server16.adblockplus.org;
324 proxy_set_header Host adblockplus.org; 324 proxy_set_header Host adblockplus.org;
325 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; 325 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
326 } 326 }
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