Merge commit 'origin/master' into archive-master

diff --combined lib/Packages/DoIndex.pm
index 32b5f7c9d8ef6c5b47f2acf77aac105813ad5eee,5aba6b3b0dc69588320b50a6e0210db114cede79..2ffa1ac1fd8b5af46729cd78ac52f81bd1d3da55
--- 1/lib/Packages/DoIndex.pm
--- 2/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;