diff options
| author | James Tunnicliffe <james.tunnicliffe@linaro.org> | 2012-06-20 12:06:51 +0100 |
|---|---|---|
| committer | James Tunnicliffe <james.tunnicliffe@linaro.org> | 2012-06-20 12:06:51 +0100 |
| commit | 9e65237290118699765c960e50201e996b916088 (patch) | |
| tree | 877e8da97a2a16cefe2014c8db1a8afc3c65f648 | |
| parent | 6c8ade32c486154ac5e941cb8ad3d9170be0d7f1 (diff) | |
Stop directly fetching license html files - always use license.php
| -rw-r--r-- | .htaccess | 6 | ||||
| -rw-r--r-- | tests/test_click_through_license.py | 6 |
2 files changed, 3 insertions, 9 deletions
@@ -30,9 +30,6 @@ RewriteRule .* - [L] ## If license file is requested, and a download has been requested previously, ## pass through to the license file. -RewriteCond %{REQUEST_URI} /licenses/ste.html$ [OR] -RewriteCond %{REQUEST_URI} /licenses/samsung.html$ [OR] -RewriteCond %{REQUEST_URI} /licenses/linaro.html$ [OR] RewriteCond %{REQUEST_URI} /licenses/nolicense.html$ [OR] RewriteCond %{REQUEST_URI} /licenses/license.php$ RewriteCond %{HTTP_COOKIE} downloadrequested @@ -41,9 +38,6 @@ RewriteRule .* - [L] ## When license files are requested directly, forward to ## the snapshots.l.o site itself. -RewriteCond %{REQUEST_URI} /licenses/linaro.html$ [OR] -RewriteCond %{REQUEST_URI} /licenses/samsung.html$ [OR] -RewriteCond %{REQUEST_URI} /licenses/ste.html$ [OR] RewriteCond %{REQUEST_URI} /licenses/license.php$ RewriteCond %{HTTP_COOKIE} !downloadrequested=(.*) RewriteRule .* / [R,L] diff --git a/tests/test_click_through_license.py b/tests/test_click_through_license.py index 00cd1c9..4a0520d 100644 --- a/tests/test_click_through_license.py +++ b/tests/test_click_through_license.py @@ -19,9 +19,9 @@ local_rewrite = 'RewriteCond %{REMOTE_ADDR} 127.0.0.1 [OR]' host = 'http://127.0.0.1' port = '0' # 0 == Pick a free port. -samsung_license_path = '/licenses/samsung.html' -ste_license_path = '/licenses/ste.html' -linaro_license_path = '/licenses/linaro.html' +samsung_license_path = '/licenses/license.php' +ste_license_path = '/licenses/license.php' +linaro_license_path = '/licenses/license.php' samsung_test_file = '/android/~linaro-android/staging-origen/test.txt' ste_test_file = ('/android/~linaro-android/staging-snowball' '/173/target/product/snowball/test.txt') |