Merge branch 'master' into debian-master

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

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 08c6f96a1c7cee40a1985e2a88eeb3006908f27f..d0343774eb2aafd64855399b05f3ec9a361cd4fb 100755 (executable)
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -64,12 +64,15 @@ sub do_dispatch {
     delete $ENV{'LC_ALL'};
     delete $ENV{'LC_MESSAGES'};
 
-    my %SUITES_ALIAS = ( oldstable => 'etch',
-                        stable => 'lenny',
-                        testing => 'squeeze',
+    my %SUITES_ALIAS = ( oldstable => 'lenny',
+                        stable => 'squeeze',
+                        testing => 'wheezy',
                         unstable => 'sid',
-                        '4.0' => 'etch',
-                        '5.0' => 'lenny' );
+                        'rc-buggy' => 'experimental',
+                        '5.0' => 'lenny',
+                        '6.0' => 'squeeze',
+                        'oldstable-backports' => 'lenny-backports',
+                        'stable-backports' => 'squeeze-backports' );
 
     # Read in all the variables set by the form
     my $input;
@@ -101,8 +104,9 @@ sub do_dispatch {
     $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 <= $last_modified) {
+       (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;
        }