Delta Between Two Patch Sets: modules/downloadserver/files/site.conf
Issue 4851712741343232:
Issue 1451 - Redirect Android devbuild update requests for versions that crash when detecting an up… (Closed)
Left Patch Set:
Created Sept. 27, 2014, 8:55 p.m.
Right Patch Set: Check $arg_addonVersion
Created Sept. 29, 2014, 11:48 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« 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') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 1 keepalive_timeout 0; | 1 keepalive_timeout 0; |
| 2 root /var/www/downloads; | 2 root /var/www/downloads; |
| 3 | 3 |
| 4 location /.hg | 4 location /.hg |
| 5 { | 5 { |
| 6 internal; | 6 internal; |
| 7 } | 7 } |
| 8 | 8 |
| 9 # This redirect is necessary since we accidentally set the wrong | 9 # This redirect is necessary since we accidentally set the wrong |
| 10 # update URL in ABP for Android 1.2. It can be removed once we're | 10 # update URL in ABP for Android 1.2. It can be removed once we're |
| 11 # not seeing anyone requesting this file anymore. | 11 # not seeing anyone requesting this file anymore. |
| 12 # Note that this intentionally promotes devbuilds to release builds. | 12 # Note that this intentionally promotes devbuilds to release builds. |
| 13 # Since newer versions should use the new devbuild and release | 13 # Since newer versions should use the new devbuild and release |
| 14 # build update URLs requested by libadblockplus, leaving this | 14 # build update URLs requested by libadblockplus, leaving this |
| 15 # redirect around won't really hurt. | 15 # redirect around won't really hurt. |
| 16 location /devbuilds/adblockplusandroid/updates.xml | 16 location /devbuilds/adblockplusandroid/updates.xml |
| 17 { | 17 { |
| 18 rewrite ^ https://adblockplus.org/androidupdates.xml?$query_string redirect; | 18 rewrite ^ https://adblockplus.org/androidupdates.xml?$query_string redirect; |
| 19 } | 19 } |
| 20 | 20 |
| 21 location /devbuilds | 21 location /devbuilds |
| 22 { | 22 { |
| 23 # This is necessary since ABP for Android revisions 323 to 337 crash when | 23 # This is necessary since ABP for Android revisions 323 to 337 crash when |
| 24 # detecting an update. Fortunately, we repeated the revision in addonVersion | 24 # detecting an update. Fortunately, we repeated the revision in addonVersion |
| 25 # in these versions for some reason, so we can use that pattern to detect | 25 # in these versions for some reason, so we can use that pattern to detect |
| 26 # them. | 26 # them. |
| 27 if ($query_string ~ "addonVersion=1\.2\.1\.3\d\d\.3\d\d") | 27 if ($arg_addonVersion ~ "^1\.2\.1\.3\d\d\.3\d\d$") |
|
Wladimir Palant
2014/09/29 11:36:01
Please check $arg_addonVersion here.
Felix Dahlke
2014/09/29 11:49:15
Done. Also anchored the expression properly as dis
| |
| 28 { | 28 { |
| 29 return 200 '{}'; | 29 return 200 '{}'; |
| 30 } | 30 } |
| 31 alias /var/www/devbuilds; | 31 alias /var/www/devbuilds; |
| 32 } | 32 } |
| LEFT | RIGHT |
« no previous file
|
no next file »
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
