X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDispatcher.pm;h=0856ef4e4d9a458e00bb0a3a8ffd7b30ec6b5409;hb=34728f0ea88eef1aab0c5fa1d369e1d6874265d7;hp=75264a006cf859d93b34d0bab59efc7abcc5687c;hpb=4fec9449ddf3d2a6162c05387367746f3e17e329;p=deb%2Fpackages.git

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 75264a0..0856ef4 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -30,6 +30,7 @@ use DB_File;
 use URI::Escape;
 use Benchmark ':hireswallclock';
 use I18N::AcceptLanguage;
+use Date::Parse;
 
 use Deb::Versions;
 use Packages::Config qw( $DBDIR $ROOT $TEMPLATEDIR $CACHEDIR
@@ -63,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
@@ -91,6 +91,21 @@ 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 + (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 $now - $last_modified < 3600;
+
+    if ($input->http('If-Modified-Since') and
+	(my $modtime = str2time($input->http('If-Modified-Since'), 'UTC'))) {
+	if ($modtime <= $last_modified) {
+	    print $input->header(-status => 304);
+	    exit;
+	}
+    }
 
     my %PO_LANGUAGES = map { $_ => 1 } @LANGUAGES;
     my %DDTP_LANGUAGES = map { $_ => 1 } @DDTP_LANGUAGES;
@@ -331,7 +346,14 @@ sub do_dispatch {
     $page_content{params} = \%params;
 
     unless (@Packages::CGI::fatal_errors) {
-	print $input->header(-charset => $charset, -type => get_mime($opts{format}) );
+	print $input->header(-charset => $charset,
+			     -type => get_mime($opts{format}),
+			     -vary => 'negotiate,accept-language',
+			     -last_modified => strftime("%a, %d %b %Y %T %z",
+							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>';
 	print $template->page( $what_to_do, { %page_content, %{ get_all_messages() } } );