From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Wed, 6 Aug 2008 20:44:32 +0000 (+0000)
Subject: Merge commit 'origin/master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=d3d569984446740ede7b0dddc08ba9e80ebdb878;hp=f14d4143bf140c785853260b8f89373f0f858544;p=deb%2Fpackages.git

Merge commit 'origin/master' into debian-master
---

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 75264a0..e8f0679 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
@@ -91,6 +92,19 @@ 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;
+    # allow some fudge, since the db mod time is not the end of
+    # the cron job
+    $last_modified = $now if $last_modified - $now < 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 +345,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($last_modified + (12*3600))),
+			     );
 	#use Data::Dumper;
 	#print '<pre>'.Dumper(\%ENV, \%page_content, get_all_messages()).'</pre>';
 	print $template->page( $what_to_do, { %page_content, %{ get_all_messages() } } );
diff --git a/lib/Packages/DoIndex.pm b/lib/Packages/DoIndex.pm
index e1c5b6d..5aba6b3 100644
--- a/lib/Packages/DoIndex.pm
+++ b/lib/Packages/DoIndex.pm
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use CGI qw( :cgi );
+use POSIX qw( strftime );
 use Exporter;
 
 use Deb::Versions;
@@ -60,7 +61,9 @@ sub send_file {
 	    $headers{'-content-encoding'} = $encoding{$opts->{format}} if exists $encoding{$opts->{format}};
 	    my ($size,$mtime) = (stat("$wwwdir/$path"))[7,9];
 	    $headers{'-content-length'} = $size;
-	    $headers{'-last-modified'} = gmtime($mtime);
+	    $headers{'-vary'} = 'negotiate,accept-language';
+	    $headers{'-last-modified'} = strftime("%a, %d %b %Y %T %z", localtime($mtime));
+	    $headers{'-expires'} = strftime("%a, %d %b %Y %T %z", localtime($mtime+(12*3600)));
 	    print header( %headers );
 
 	    binmode INDEX;