X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDispatcher.pm;h=d8b750c18d784604f2d37d461b16e50c543ede97;hb=e9e5399ad699b724ed7d236b43f76b3ff85050bd;hp=c2500116f10593f69406af17c084c921def23660;hpb=f12ba374c31cd6192475847bd0549297a4c968de;p=deb%2Fpackages.git

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index c250011..d8b750c 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -92,10 +92,17 @@ sub do_dispatch {
     my $homedir = dirname($ENV{SCRIPT_FILENAME}).'/../';
     &Packages::Config::init( $homedir );
     &Packages::DB::init();
+    my $last_modified = $Packages::DB::db_read_time;
+    my $now = time;
+    my $expires = $last_modified + (12*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 $now - $last_modified < 3600;
 
     if ($input->http('If-Modified-Since') and
 	(my $modtime = str2time($input->http('If-Modified-Since'), 'UTC'))) {
-	if ($modtime < $Packages::DB::db_read_time) {
+	if ($modtime <= $last_modified) {
 	    print $input->header(-status => 304);
 	    exit;
 	}
@@ -342,8 +349,11 @@ sub do_dispatch {
     unless (@Packages::CGI::fatal_errors) {
 	print $input->header(-charset => $charset,
 			     -type => get_mime($opts{format}),
+			     -vary => 'negotiate,accept-language',
 			     -last_modified => strftime("%a, %d %b %Y %T %z",
-							localtime($Packages::DB::db_read_time)),
+							localtime($last_modified)),
+			     -expires => strftime("%a, %d %b %Y %T %z",
+						  localtime($expires)),
 			     );
 	#use Data::Dumper;
 	#print '<pre>'.Dumper(\%ENV, \%page_content, get_all_messages()).'</pre>';