gitweb: don't use pathinfo for global actions
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>maint
parent
df63fbbf46
commit
fb098a942b
|
@ -830,7 +830,7 @@ sub href (%) {
|
||||||
}
|
}
|
||||||
|
|
||||||
my $use_pathinfo = gitweb_check_feature('pathinfo');
|
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:
|
# try to put as many parameters as possible in PATH_INFO:
|
||||||
# - project name
|
# - project name
|
||||||
# - action
|
# - action
|
||||||
|
@ -845,7 +845,7 @@ sub href (%) {
|
||||||
$href =~ s,/$,,;
|
$href =~ s,/$,,;
|
||||||
|
|
||||||
# Then add the project name, if present
|
# Then add the project name, if present
|
||||||
$href .= "/".esc_url($params{'project'}) if defined $params{'project'};
|
$href .= "/".esc_url($params{'project'});
|
||||||
delete $params{'project'};
|
delete $params{'project'};
|
||||||
|
|
||||||
# since we destructively absorb parameters, we keep this
|
# since we destructively absorb parameters, we keep this
|
||||||
|
|
Loading…
Reference in New Issue