diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-08-18 10:02:35 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-08-18 10:02:35 +0200 |
| commit | d1fd09b982f6108dc32ec75330b0535236c48311 (patch) | |
| tree | c0dce6cf7501c1e0d5e3bad34e9b63c0d6dcd354 /test/integration/test-partial-file-support | |
| parent | b5fcba3682581b2a48921cc830dbf3deae6b0ff3 (diff) | |
| parent | 43670e2ef8b689d9efba633d11d2a5fc6f9968a0 (diff) | |
Merge tag '1.3_rc2' into ubuntu
apt Debian release 1.3~rc2
Diffstat (limited to 'test/integration/test-partial-file-support')
| -rwxr-xr-x | test/integration/test-partial-file-support | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/integration/test-partial-file-support b/test/integration/test-partial-file-support index 1c5d120d8..9b5eed1e5 100755 --- a/test/integration/test-partial-file-support +++ b/test/integration/test-partial-file-support @@ -96,6 +96,7 @@ followuprequest() { testrun() { webserverconfig 'aptwebserver::support::range' 'true' + webserverconfig 'aptwebserver::response-header::Accept-Ranges' 'bytes' local DOWN='./downloaded/testfile' copysource $TESTFILE 0 $DOWN @@ -125,7 +126,11 @@ testrun() { testdownloadfile 'old data' "${1}/testfile" "$DOWN" '=' testwebserverlaststatuscode '200' "$DOWNLOADLOG" - webserverconfig 'aptwebserver::support::range' 'false' + if [ "${1%%:*}" = 'https' ] && expr match "$1" "^.*/redirectme$" >/dev/null; then + webserverconfig 'aptwebserver::response-header::Accept-Ranges' 'none' + else + webserverconfig 'aptwebserver::support::range' 'false' + fi copysource $TESTFILE 20 $DOWN testdownloadfile 'no server support' "${1}/testfile" "$DOWN" '=' @@ -148,4 +153,5 @@ changetohttpswebserver serverconfigs "https://localhost:${APTHTTPSPORT}" webserverconfig 'aptwebserver::redirect::replace::/redirectme/' "https://localhost:${APTHTTPSPORT}/" +serverconfigs "https://localhost:${APTHTTPSPORT}/redirectme" serverconfigs "http://localhost:${APTHTTPPORT}/redirectme" |