Skip to content

Commit

Permalink
gitweb: don't use pathinfo for global actions
Browse files Browse the repository at this point in the history
With PATH_INFO urls, actions for the projects list (e.g. opml,
project_index) were being put in the URL right after the base. The
resulting URL is not properly parsed by gitweb itself, since it expects
a project name as first component of the URL.

Accepting global actions in use_pathinfo is not a very robust solution
due to possible present and future conflicts between project names and
global actions, therefore we just refuse to create PATH_INFO URLs when
the project is not defined.

Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Giuseppe Bilotta authored and Junio C Hamano committed Jan 7, 2009
1 parent df63fbb commit fb098a9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions gitweb/gitweb.perl
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@ (%)
}

my $use_pathinfo = gitweb_check_feature('pathinfo');
if ($use_pathinfo) {
if ($use_pathinfo and defined $params{'project'}) {
# try to put as many parameters as possible in PATH_INFO:
# - project name
# - action
Expand All @@ -845,7 +845,7 @@ (%)
$href =~ s,/$,,;

# Then add the project name, if present
$href .= "/".esc_url($params{'project'}) if defined $params{'project'};
$href .= "/".esc_url($params{'project'});
delete $params{'project'};

# since we destructively absorb parameters, we keep this
Expand Down

0 comments on commit fb098a9

Please sign in to comment.