Re: [PATCH] gitweb: don't use pathinfo for global actions

From: Jakub Narebski <jnareb@gmail.com>
Date: Jan 6, 2009, 17:37 UTC
Message-ID: <200901061837.23637.jnareb@gmail.com>
In-Reply-To: <1230896080-22801-1-git-send-email-giuseppe.bilotta@gmail.com>

On Fri, 2 Jan 2009, Giuseppe Bilotta wrote:

> 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.

Therefore it really needs to be in, as df63fb also by Giuseppe (gitweb: use href() when generating URLs in OPML) is already in, and I think gitweb would generate broken OPML and TXT links without this patch.

Show 5 quoted lines

> 
> 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.

I think it is quite robust solution and it makes sense; we use shortcuts http://git.example.com for projects_list page, and http://git.example.com/path/to/repo.git for overview 'summary' action for a project, therefore pathinfo has to look like the following: http://git.example.com/repo/action/hash with "action" _after_ "project". And there is also matter of backward compatibility of URL (URLs shouldn't break).

Anyway, we have $home_link for default project_list page, which is path_info without project, and query without query string...

> 
> Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>

Acked-by: Jakub Narebski <jnareb@gmail.com>

Show 26 quoted lines

> ---
>  gitweb/gitweb.perl |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 99f71b4..fa7d8ad 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -830,7 +830,7 @@ sub href (%) {
>  	}
>  
>  	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
> @@ -845,7 +845,7 @@ sub href (%) {
>  		$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

Nice.

> -- 
> 1.5.6.5
> 
>

-- 
Jakub Narebski
Poland