mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-05 14:26:31 +02:00
Code

gitweb: Fix mod_perl support. 

ModPerl::Registry precompiles scripts by wrapping them
in a subroutine. This causes ordinary subroutines of the
script to become nested, and warnings appear:

gitweb.cgi: Variable "$path_info" will not stay shared

This warning means that $path_info was declared as 'my',
and thus according to the perl evaluation rules all nested
subroutines will retain a reference to the instance of the
variable used in the first invocation of the master script.

When the script (i.e. the master meta-subroutine) is executed
the second time, it will use a new instance, so the logic
breaks. To avoid this it is necessary to declare all global
variables as 'our', which places them at the package level.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alexander Gavrilov 2008-11-06 01:10:07 +03:00 committed by Junio C Hamano
parent dd7f5f105a
commit dde80d9c23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gitweb/gitweb.perl
View File

@ -30,7 +30,7 @@ BEGIN
# if we're called with PATH_INFO, we have to strip that
# from the URL to find our real URL
# we make $path_info global because it's also used later on
my $path_info = $ENV{"PATH_INFO"};
our $path_info = $ENV{"PATH_INFO"};
if ($path_info) {
$my_url =~ s,\Q$path_info\E$,,;
$my_uri =~ s,\Q$path_info\E$,,;
@ -442,7 +442,7 @@ sub filter_snapshot_fmts {
# together during validation: this allows subsequent uses (e.g. href()) to be
# agnostic of the parameter origin
my %input_params = ();
our %input_params = ();
# input parameters are stored with the long parameter name as key. This will
# also be used in the href subroutine to convert parameters to their CGI
@ -452,7 +452,7 @@ sub filter_snapshot_fmts {
# XXX: Warning: If you touch this, check the search form for updating,
# too.
my @cgi_param_mapping = (
our @cgi_param_mapping = (
project => "p",
action => "a",
file_name => "f",
@ -469,10 +469,10 @@ sub filter_snapshot_fmts {
extra_options => "opt",
search_use_regexp => "sr",
);
my %cgi_param_mapping = @cgi_param_mapping;
our %cgi_param_mapping = @cgi_param_mapping;
# we will also need to know the possible actions, for validation
my %actions = (
our %actions = (
"blame" => \&git_blame,
"blobdiff" => \&git_blobdiff,
"blobdiff_plain" => \&git_blobdiff_plain,
@ -504,7 +504,7 @@ sub filter_snapshot_fmts {
# finally, we have the hash of allowed extra_options for the commands that
# allow them
my %allowed_options = (
our %allowed_options = (
"--no-merges" => [ qw(rss atom log shortlog history) ],
);