From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Wed, 6 Aug 2008 05:38:04 +0000 (+0200)
Subject: Merge commit 'origin/master' into archive-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=547737cf56224b3bfd95822cebe01890fdc7e829;hp=-c;p=deb%2Fpackages.git

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

547737cf56224b3bfd95822cebe01890fdc7e829
diff --combined lib/Packages/DoIndex.pm
index 32b5f7c,5aba6b3..2ffa1ac
--- a/lib/Packages/DoIndex.pm
+++ b/lib/Packages/DoIndex.pm
@@@ -4,6 -4,7 +4,7 @@@ use strict
  use warnings;
  
  use CGI qw( :cgi );
+ use POSIX qw( strftime );
  use Exporter;
  
  use Deb::Versions;
@@@ -46,7 -47,7 +47,7 @@@ sub send_file 
      my $path = "";
      $path .= "source/" if $opts->{source};
      $path .= "$opts->{suite}[0]/";
 -    $path .= "$opts->{archive}[0]/" if @{$opts->{archive}} == 1;
 +#    $path .= "$opts->{archive}[0]/" if @{$opts->{archive}} == 1;
      $path .= "$opts->{subsection}[0]/" if @{$opts->{subsection}};
      $path .= "$opts->{priority}[0]/" if @{$opts->{priority}};
      $path .= "$file.$opts->{po_lang}.$opts->{format}";
@@@ -60,7 -61,9 +61,9 @@@
  	    $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;