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

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 986b12a..c247be9 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -64,12 +64,12 @@ sub do_dispatch {
     delete $ENV{'LC_ALL'};
     delete $ENV{'LC_MESSAGES'};
 
-    my %SUITES_ALIAS = ( oldstable => 'sarge',
-			 stable => 'etch',
-			 testing => 'lenny',
+    my %SUITES_ALIAS = ( oldstable => 'etch',
+			 stable => 'lenny',
+			 testing => 'squeeze',
 			 unstable => 'sid',
-			 '3.1' => 'sarge',
-			 '4.0' => 'etch' );
+			 '4.0' => 'etch',
+			 '5.0' => 'lenny' );
 
     # Read in all the variables set by the form
     my $input;
@@ -92,10 +92,18 @@ 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) {
+	(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;
 	}
@@ -170,7 +178,11 @@ sub do_dispatch {
 	} elsif (@components == 0) {
 	    fatal_error( "We're supposed to display the homepage here, instead of getting dispatch.pl" );
 	} elsif (@components == 1) {
-	    $what_to_do = 'search';
+	    if ($components[0] eq 'index') {
+		$what_to_do = 'homepage';
+	    } else {
+		$what_to_do = 'search';
+	    }
 	} else {
 
 	    for ($components[-1]) {
@@ -344,7 +356,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>';