gitweb: hack around CGI's list-context param() handling

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 39f6641460280c3d7052710aa467efa4102082c4cd8d795c1871b1019b370d31..9956e5991d009314fd0577b7f6ae10f3afc363a1c60de404b7b2d50bc28ca0d5 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -20,6 +20,10 @@ use File::Basename qw(basename);
 use Time::HiRes qw(gettimeofday tv_interval);
 binmode STDOUT, ':utf8';
 
 use Time::HiRes qw(gettimeofday tv_interval);
 binmode STDOUT, ':utf8';
 

+if (!defined($CGI::VERSION) || $CGI::VERSION < 4.08) {
+       eval 'sub CGI::multi_param { CGI::param(@_) }'
+}
+

 our $t0 = [ gettimeofday() ];
 our $number_of_git_cmds = 0;
 
 our $t0 = [ gettimeofday() ];
 our $number_of_git_cmds = 0;
 


@@ -872,7 +876,7 @@ sub evaluate_query_params {
 
        while (my ($name, $symbol) = each %cgi_param_mapping) {
                if ($symbol eq 'opt') {
 
        while (my ($name, $symbol) = each %cgi_param_mapping) {
                if ($symbol eq 'opt') {

-                       $input_params{$name} = [ map { decode_utf8($_) } $cgi->param($symbol) ];
+                       $input_params{$name} = [ map { decode_utf8($_) } $cgi->multi_param($symbol) ];

                } else {
                        $input_params{$name} = decode_utf8($cgi->param($symbol));
                }
                } else {
                        $input_params{$name} = decode_utf8($cgi->param($symbol));
                }


@@ -1491,7 +1495,7 @@ sub is_valid_pathname {
        my $input = shift;
 
        return undef unless defined $input;
        my $input = shift;
 
        return undef unless defined $input;

-       # no '.' or '..' as elements of path, i.e. no '.' nor '..'
+       # no '.' or '..' as elements of path, i.e. no '.' or '..'

        # at the beginning, at the end, and between slashes.
        # also this catches doubled slashes
        if ($input =~ m!(^|/)(|\.|\.\.)(/|$)!) {
        # at the beginning, at the end, and between slashes.
        # also this catches doubled slashes
        if ($input =~ m!(^|/)(|\.|\.\.)(/|$)!) {


@@ -4101,7 +4105,7 @@ sub print_search_form {
        if ($use_pathinfo) {
                $action .= "/".esc_url($project);
        }
        if ($use_pathinfo) {
                $action .= "/".esc_url($project);
        }

-       print $cgi->startform(-method => "get", -action => $action) .
+       print $cgi->start_form(-method => "get", -action => $action) .

              "<div class=\"search\">\n" .
              (!$use_pathinfo &&
              $cgi->input({-name=>"p", -value=>$project, -type=>"hidden"}) . "\n") .
              "<div class=\"search\">\n" .
              (!$use_pathinfo &&
              $cgi->input({-name=>"p", -value=>$project, -type=>"hidden"}) . "\n") .


@@ -5511,7 +5515,7 @@ sub git_project_search_form {
        }
 
        print "<div class=\"projsearch\">\n";
        }
 
        print "<div class=\"projsearch\">\n";

-       print $cgi->startform(-method => 'get', -action => $my_uri) .
+       print $cgi->start_form(-method => 'get', -action => $my_uri) .

              $cgi->hidden(-name => 'a', -value => 'project_list')  . "\n";
        print $cgi->hidden(-name => 'pf', -value => $project_filter). "\n"
                if (defined $project_filter);
              $cgi->hidden(-name => 'a', -value => 'project_list')  . "\n";
        print $cgi->hidden(-name => 'pf', -value => $project_filter). "\n"
                if (defined $project_filter);