Merge commit 'origin/master' into debian-master

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

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index ff6842687b9a7536a6c872312fae24d89990f1e3..39ecab73adcbd4f83b44a3057719716b01a7b829 100755 (executable)
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -139,7 +139,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;
@@ -279,14 +279,14 @@ sub do_dispatch {
 
     my $locale = get_locale($opts{lang});
     my $charset = get_charset($opts{lang});
-    setlocale ( LC_ALL, $locale )
-       or do { debug( "couldn't set locale $locale, using default" ) if DEBUG;
-               setlocale( LC_ALL, get_locale() )
-                   or do {
-                       debug( "couldn't set default locale either" ) if DEBUG;
+#    setlocale ( LC_ALL, $locale )
+#      or do { debug( "couldn't set locale $locale, using default" ) if DEBUG;
+#              setlocale( LC_ALL, get_locale() )
+#                  or do {
+#                      debug( "couldn't set default locale either" ) if DEBUG;
                        setlocale( LC_ALL, "C" );
-                   };
-           };
+#                  };
+#          };
     debug( "locale=$locale charset=$charset", 1 ) if DEBUG;
 
     $opts{h_suites} = { map { $_ => 1 } @suites };