From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Mon, 3 Sep 2007 23:56:07 +0000 (+0000)
Subject: Merge commit 'origin/master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;ds=inline;h=793567cde5620b1197615e324e804458b0564ac8;hp=-c;p=deb%2Fpackages.git

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

793567cde5620b1197615e324e804458b0564ac8
diff --combined lib/Packages/Dispatcher.pm
index 3c0694a,4c3c31f..9639e92
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@@ -138,7 -138,7 +138,7 @@@ sub do_dispatch 
  
      my $what_to_do = 'show';
      my $source = 0;
 -    if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
 +    if (my $path = $ENV{'PATH_INFO'} || $input->param('PATH_INFO')) {
  	my @components = grep { $_ } map { lc $_ } split /\/+/, $path;
  
  	debug( "PATH_INFO=$path components=@components", 3) if DEBUG;
@@@ -271,7 -271,7 +271,7 @@@
  				 array => ',', var => \@archs, replace =>
  				 { any => \@ARCHITECTURES } },
  		       format => { default => 'html', match => '^([\w.]+)$',  },
- 		   mode => { default => undef, match => '^(\w+)$',  },
+ 		   mode => { default => '', match => '^(\w+)$',  },
  		   sort_by => { default => 'file', match => '^(\w+)$', },
  		   );
      my %opts;