Re: [PATCHv6 3/5] gitweb: use_pathinfo filenames start with /
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Oct 18, 2008, 23:26 UTC
- Message-ID
- <200810190126.06697.jnareb@gmail.com>
- In-Reply-To
- <1224188831-17767-4-git-send-email-giuseppe.bilotta@gmail.com>
On Thu, 16 Oct 2008, Giuseppe Bilotta wrote:
> When using path info, make filenames start with a / (right after the :
> that separates them from the hash base). This minimal change allows
> relative navigation to work properly when viewing HTML files in raw
> ('blob_plain') mode.This means generating project/action/hash_base:/filename rather than earlier project/action/hash_base:filename, isn't it?
For example for http://repo.or.cz/w/git.git/html:/git.html links leads to correct HTML pages, while for http://repo.or.cz/w/git.git/html:git.html they lead to empty gitweb page (no errors, so link checker would be fooled).
> > Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Show 35 quoted lines
> ---
> gitweb/gitweb.perl | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 5337d40..49730f3 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -727,7 +727,7 @@ sub href (%) {
> # try to put as many parameters as possible in PATH_INFO:
> # - project name
> # - action
> - # - hash or hash_base:filename
> + # - hash or hash_base:/filename
>
> # When the script is the root DirectoryIndex for the domain,
> # $href here would be something like http://gitweb.example.com/
> @@ -746,11 +746,11 @@ sub href (%) {
> delete $params{'action'};
> }
>
> - # Finally, we put either hash_base:file_name or hash
> + # Finally, we put either hash_base:/file_name or hash
> if (defined $params{'hash_base'}) {
> $href .= "/".esc_url($params{'hash_base'});
> if (defined $params{'file_name'}) {
> - $href .= ":".esc_url($params{'file_name'});
> + $href .= ":/".esc_url($params{'file_name'});
> delete $params{'file_name'};
> }
> delete $params{'hash'};
> --
> 1.5.6.5
>
> -- Jakub Narebski Poland