Matt McCutchen <matt@xxxxxxxxxxxxxxxxx> writes: > My Web site uses pathinfo mode and some rewrite magic to show the gitweb > interface at the URL of the real repository directory (which users also > pull from). In this case, it's desirable to end generated links to the > project in a trailing slash so the Web server doesn't have to redirect > the client to add the slash. This patch adds a second element to the > "pathinfo" feature configuration to control the trailing slash. > > Signed-off-by: Matt McCutchen <matt@xxxxxxxxxxxxxxxxx> Did you check that it does not confuse gitweb if filename parameter is passed using pathinfo? Gitweb used to rely on final '/' to distinguish directory pathnames from ordinary pathnames, but I think currently thanks to the fact that gitweb now embeds action in pathinfo URL, and does not need to guess type, it is not an issue. Or only project URLs (i.e. only with project parameter, i.e. only "http://git.example.com/project.git/"; but not other path_info links) have trailing slash added? Errr... I see that it adds trailing slash only for project-only path_info links, but the commit message was not entirely clear for me. (CC-ed author of path_info enhancements, Giuseppe Bilotta) > --- > Resending with a sign-off. Thanks. > gitweb/gitweb.perl | 28 ++++++++++++++++++++++------ > 1 files changed, 22 insertions(+), 6 deletions(-) > > diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl > index 6eb370d..86511cf 100755 > --- a/gitweb/gitweb.perl > +++ b/gitweb/gitweb.perl > @@ -270,6 +270,11 @@ our %feature = ( > # $feature{'pathinfo'}{'default'} = [1]; > # Project specific override is not supported. > > + # If you want a trailing slash on the project path (because, for > + # example, you have a real directory at that URL and are using > + # some rewrite magic to invoke gitweb), then set: > + # $feature{'pathinfo'}{'default'} = [1, 1]; > + Are any disadvantages to having it always enabled? BTW. encoding data in position in array feels a bit hacky to me, but I guess that is the limitation of current %feature design, with 'default' having to be array (reference). > # Note that you will need to change the default location of CSS, > # favicon, logo and possibly other files to an absolute URL. Also, > # if gitweb.cgi serves as your indexfile, you will need to force > @@ -829,8 +834,8 @@ sub href (%) { > } > } > > - my $use_pathinfo = gitweb_check_feature('pathinfo'); > - if ($use_pathinfo) { > + my @use_pathinfo = gitweb_get_feature('pathinfo'); Why not name those variables for better readability? + my ($use_pathinfo, $trailing_slash) = gitweb_get_feature('pathinfo'); > + if ($use_pathinfo[0]) { > # try to put as many parameters as possible in PATH_INFO: > # - project name > # - action > @@ -845,7 +850,12 @@ sub href (%) { > $href =~ s,/$,,; > > # Then add the project name, if present > - $href .= "/".esc_url($params{'project'}) if defined $params{'project'}; > + my $proj_href = undef; > + if (defined $params{'project'}) { > + $href .= "/".esc_url($params{'project'}); > + # Save for trailing-slash check below. > + $proj_href = $href; > + } > delete $params{'project'}; > > # since we destructively absorb parameters, we keep this > @@ -903,6 +913,10 @@ sub href (%) { > $href .= $known_snapshot_formats{$fmt}{'suffix'}; > delete $params{'snapshot_format'}; > } > + > + # If requested in the configuration, add a trailing slash to a URL that > + # has nothing appended after the project path. > + $href .= '/' if ($use_pathinfo[1] && defined $proj_href && $href eq $proj_href); > } The check _feels_ inefficient. I think (but feel free to disagree) that it would be better to use something like $project_pathinfo, set it when adding project as pathinfo, and unset if we add anything else as pathinfo. > > # now encode the parameters explicitly > @@ -2987,13 +3001,15 @@ EOF > $search_hash = "HEAD"; > } > my $action = $my_uri; > - my $use_pathinfo = gitweb_check_feature('pathinfo'); > - if ($use_pathinfo) { > + my @use_pathinfo = gitweb_get_feature('pathinfo'); Same comment as above: better named variable instead of relying on position in array. > + if ($use_pathinfo[0]) { > $action .= "/".esc_url($project); > + # Add a trailing slash if requested in the configuration. > + $action .= '/' if ($use_pathinfo[1]); Hmmm... let me check something... you rely on the fact that $project doesn't end with slash, while I think (but please check it) that it can end with slash if it is provided by CGI query. > } > print $cgi->startform(-method => "get", -action => $action) . > "<div class=\"search\">\n" . > - (!$use_pathinfo && > + (!$use_pathinfo[0] && > $cgi->input({-name=>"p", -value=>$project, -type=>"hidden"}) . "\n") . > $cgi->input({-name=>"a", -value=>"search", -type=>"hidden"}) . "\n" . > $cgi->input({-name=>"h", -value=>$search_hash, -type=>"hidden"}) . "\n" . > -- > 1.6.1.rc2.27.gc7114 > -- Jakub Narebski Poland ShadeHawk on #git -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
