gitweb: Fix bug in evaluate_path_info

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 4df6db5974d61faa9450d90b5e652ee7b99348fc968a5d25ca90ce9cc9574b69..df186d8d2a107ef28ad8ca7e3724963b6519db39b4c90d64b416d9a23508d1a5 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -782,10 +782,10 @@ sub evaluate_path_info {
                'history',
        );
 
                'history',
        );
 

-       # we want to catch
+       # we want to catch, among others

        # [$hash_parent_base[:$file_parent]..]$hash_parent[:$file_name]
        my ($parentrefname, $parentpathname, $refname, $pathname) =
        # [$hash_parent_base[:$file_parent]..]$hash_parent[:$file_name]
        my ($parentrefname, $parentpathname, $refname, $pathname) =

-               ($path_info =~ /^(?:(.+?)(?::(.+))?\.\.)?(.+?)(?::(.+))?$/);
+               ($path_info =~ /^(?:(.+?)(?::(.+))?\.\.)?([^:]+?)?(?::(.+))?$/);

 
        # first, analyze the 'current' part
        if (defined $pathname) {
 
        # first, analyze the 'current' part
        if (defined $pathname) {


@@ -1069,6 +1069,7 @@ sub run_request {
 
        evaluate_uri();
        evaluate_gitweb_config();
 
        evaluate_uri();
        evaluate_gitweb_config();

+       evaluate_git_version();

        check_loadavg();
 
        # $projectroot and $projects_list might be set in gitweb config file
        check_loadavg();
 
        # $projectroot and $projects_list might be set in gitweb config file


@@ -1121,7 +1122,6 @@ sub evaluate_argv {
 
 sub run {
        evaluate_argv();
 
 sub run {
        evaluate_argv();

-       evaluate_git_version();

 
        $pre_listen_hook->()
                if $pre_listen_hook;
 
        $pre_listen_hook->()
                if $pre_listen_hook;