Merge branch 'jn/web' into next

* jn/web:
gitweb: Make use of $PATH_INFO for project parameter

diff --git a/gitweb/gitweb.cgi b/gitweb/gitweb.cgi
index ef7fcbd84f1b80bfef982685a445cca1923692af..f2e50462d9b6160127b35f659ff8586369723b07 100755 (executable)
--- a/gitweb/gitweb.cgi
+++ b/gitweb/gitweb.cgi
@@ -86,8 +86,9 @@ if (defined $order) {
        }
 }
 
-my $project = $cgi->param('p');
+my $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
 if (defined $project) {
+       $project =~ s|^/||; $project =~ s|/$||;
        $project = validate_input($project);
        if (!defined($project)) {
                die_error(undef, "Invalid project parameter.");