Merge commit 'origin/master' into archive-master

[deb/packages.git] / lib / Packages / DoIndex.pm

diff --git a/lib/Packages/DoIndex.pm b/lib/Packages/DoIndex.pm
index 2ffa1ac1fd8b5af46729cd78ac52f81bd1d3da55..9eaf34e08135914a52013421881c49fb92d00e12 100644 (file)
--- a/lib/Packages/DoIndex.pm
+++ b/lib/Packages/DoIndex.pm
@@ -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}";
@@ -63,7 +63,7 @@ sub send_file {
            $headers{'-content-length'} = $size;
            $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)));
+           $headers{'-expires'} = strftime("%a, %d %b %Y %T %z", localtime($mtime+(365*24*3600)));
            print header( %headers );
 
            binmode INDEX;