X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FDispatcher.pm;h=e2771b9fadd5df910fc1e0454484b86a0a1fc38d;hp=986b12a92212b3acbecb4dc951519c8c15a35482;hb=0c1a44893f94f98deac8435e6ab235228880087f;hpb=013d90de12d542d43b2afa871539b795ee17914f

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 986b12a..e2771b9 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -64,11 +64,10 @@ sub do_dispatch {
     delete $ENV{'LC_ALL'};
     delete $ENV{'LC_MESSAGES'};
 
-    my %SUITES_ALIAS = ( oldstable => 'sarge',
+    my %SUITES_ALIAS = ( #oldstable => 'sarge',
 			 stable => 'etch',
 			 testing => 'lenny',
 			 unstable => 'sid',
-			 '3.1' => 'sarge',
 			 '4.0' => 'etch' );
 
     # Read in all the variables set by the form
@@ -92,10 +91,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;
 	}
@@ -344,7 +350,9 @@ sub do_dispatch {
 			     -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>';