diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2013-12-22 13:08:56 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2013-12-22 13:08:56 +0400 |
| commit | b966ec346bebe34e1f50fb9cc46b9adf111ea73d (patch) | |
| tree | 5264705c133f3836ed0deca1915b30a4f29caaa9 /tests/cachable.t | |
| parent | ef95a4944d8367259f3b432e2ab1a84d9f5ed024 (diff) | |
| parent | 9679c2dc7c0098b667c0ea8bbf309d5ae60a6cc3 (diff) | |
| download | lighttpd-b966ec346bebe34e1f50fb9cc46b9adf111ea73d.tar.gz | |
Merge branch 'master' of git://git.debian.org/git/pkg-lighttpd/lighttpd
Conflicts:
debian/changelog
Diffstat (limited to 'tests/cachable.t')
| -rwxr-xr-x | tests/cachable.t | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/cachable.t b/tests/cachable.t index 605a68f..381f44e 100755 --- a/tests/cachable.t +++ b/tests/cachable.t @@ -78,8 +78,8 @@ If-None-Match: $etag If-Modified-Since: Sun, 01 Jan 1970 00:00:01 GMT; foo EOF ); -$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ]; -ok($tf->handle_http($t) == 0, 'Conditional GET - ETag + old Last-Modified'); +$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 304 } ]; +ok($tf->handle_http($t) == 0, 'Conditional GET - ETag + old Last-Modified (which should be ignored)'); $t->{REQUEST} = ( <<EOF GET / HTTP/1.0 @@ -88,7 +88,7 @@ If-Modified-Since: $now; foo EOF ); $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 304 } ]; -ok($tf->handle_http($t) == 0, 'Conditional GET - ETag, Last-Modified + comment'); +ok($tf->handle_http($t) == 0, 'Conditional GET - ETag, Last-Modified + comment (which should be ignored)'); $t->{REQUEST} = ( <<EOF GET / HTTP/1.0 @@ -105,8 +105,8 @@ If-None-Match: $etag If-Modified-Since: $now foo EOF ); -$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 412 } ]; -ok($tf->handle_http($t) == 0, 'Conditional GET - ETag + Last-Modified + overlong timestamp'); +$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 304 } ]; +ok($tf->handle_http($t) == 0, 'Conditional GET - ETag + Last-Modified + overlong timestamp (which should be ignored)'); $t->{REQUEST} = ( <<EOF GET / HTTP/1.0 |