Merge branch 'master' into archive-master

[deb/packages.git] / lib / Packages / Dispatcher.pm

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 7ded77ef31f78077d4016e46d3637a0e6e7a5904..35b04598f2a7b87824a41ca4f97541f57d0281e3 100755 (executable)
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -94,9 +94,11 @@ sub do_dispatch {
     &Packages::DB::init();
     my $last_modified = $Packages::DB::db_read_time;
     my $now = time;
+    my $expires = $last_modified + (365*24*3600);
+    $expires = $now + 3600 if $expires < $now;
     # allow some fudge, since the db mod time is not the end of
     # the cron job
-    $last_modified = $now if $last_modified - $now < 3600; 
+    $last_modified = $now if $now - $last_modified < 3600;
 
     if ($input->http('If-Modified-Since') and
        (my $modtime = str2time($input->http('If-Modified-Since'), 'UTC'))) {
@@ -351,7 +353,7 @@ sub do_dispatch {
                             -last_modified => strftime("%a, %d %b %Y %T %z",
                                                        localtime($last_modified)),
                             -expires => strftime("%a, %d %b %Y %T %z",
-                                                 localtime($last_modified + (365*24*3600))),
+                                                 localtime($expires)),
                             );
        #use Data::Dumper;
        #print '<pre>'.Dumper(\%ENV, \%page_content, get_all_messages()).'</pre>';