From: Gerfried Fuchs <rhonda@debian.org>
Date: Mon, 31 Oct 2011 14:10:45 +0000 (+0100)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=2cbbd4fcf8594eb2c92e94a948ad01acb770e223;hp=926be4db09b1c0d364801c4b2707ccc028590494;p=deb%2Fpackages.git

Merge branch 'master' into ubuntu-master
---

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 08c6f96..105117f 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -101,8 +101,9 @@ sub do_dispatch {
     $last_modified = $now if $now - $last_modified < 3600;
 
     if ($input->http('If-Modified-Since') and
-	(my $modtime = str2time($input->http('If-Modified-Since'), 'UTC'))) {
-	if ($modtime <= $last_modified) {
+	(my $client_timestamp = str2time($input->http('If-Modified-Since'), 'UTC'))) {
+	if ($client_timestamp > $last_modified) {
+	    # we are not modified since asked -> return "304 Not Modified"
 	    print $input->header(-status => 304);
 	    exit;
 	}