perl: bump the required Perl version to 5.8 from 5.6.[21]

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index f3d8ad86288935dce883c19877f48879022bc01797af0a35e9dfafb72f94b540..4df6db5974d61faa9450d90b5e652ee7b99348fc968a5d25ca90ce9cc9574b69 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -7,6 +7,7 @@
 #
 # This program is licensed under the GPLv2
 
 #
 # This program is licensed under the GPLv2
 

+use 5.008;

 use strict;
 use warnings;
 use CGI qw(:standard :escapeHTML -nosticky);
 use strict;
 use warnings;
 use CGI qw(:standard :escapeHTML -nosticky);


@@ -166,6 +167,12 @@ our @diff_opts = ('-M'); # taken from git_commit
 # the gitweb domain.
 our $prevent_xss = 0;
 
 # the gitweb domain.
 our $prevent_xss = 0;
 

+# Path to the highlight executable to use (must be the one from
+# http://www.andre-simon.de due to assumptions about parameters and output).
+# Useful if highlight is not installed on your webserver's PATH.
+# [Default: highlight]
+our $highlight_bin = "++HIGHLIGHT_BIN++";
+

 # information about snapshot formats that gitweb is capable of serving
 our %known_snapshot_formats = (
        # name => {
 # information about snapshot formats that gitweb is capable of serving
 our %known_snapshot_formats = (
        # name => {


@@ -269,7 +276,7 @@ our %feature = (
        # return value of feature-sub indicates if to enable specified feature
        #
        # if there is no 'sub' key (no feature-sub), then feature cannot be
        # return value of feature-sub indicates if to enable specified feature
        #
        # if there is no 'sub' key (no feature-sub), then feature cannot be

-       # overriden
+       # overridden

        #
        # use gitweb_get_feature(<feature>) to retrieve the <feature> value
        # (an array) or gitweb_check_feature(<feature>) to check if <feature>
        #
        # use gitweb_get_feature(<feature>) to retrieve the <feature> value
        # (an array) or gitweb_check_feature(<feature>) to check if <feature>


@@ -1347,7 +1354,7 @@ sub esc_param {
        return $str;
 }
 
        return $str;
 }
 

-# quote unsafe chars in whole URL, so some charactrs cannot be quoted
+# quote unsafe chars in whole URL, so some characters cannot be quoted

 sub esc_url {
        my $str = shift;
        return undef unless defined $str;
 sub esc_url {
        my $str = shift;
        return undef unless defined $str;


@@ -3361,7 +3368,8 @@ sub run_highlighter {
        close $fd
                or die_error(404, "Reading blob failed");
        open $fd, quote_command(git_cmd(), "cat-file", "blob", $hash)." | ".
        close $fd
                or die_error(404, "Reading blob failed");
        open $fd, quote_command(git_cmd(), "cat-file", "blob", $hash)." | ".

-                 "highlight --xhtml --fragment --syntax $syntax |"
+                 quote_command($highlight_bin).
+                 " --xhtml --fragment --syntax $syntax |"

                or die_error(500, "Couldn't open file or run syntax highlighter");
        return $fd;
 }
                or die_error(500, "Couldn't open file or run syntax highlighter");
        return $fd;
 }


@@ -3782,9 +3790,9 @@ sub git_print_authorship {
 }
 
 # Outputs table rows containing the full author or committer information,
 }
 
 # Outputs table rows containing the full author or committer information,

-# in the format expected for 'commit' view (& similia).
+# in the format expected for 'commit' view (& similar).

 # Parameters are a commit hash reference, followed by the list of people
 # Parameters are a commit hash reference, followed by the list of people

-# to output information for. If the list is empty it defalts to both
+# to output information for. If the list is empty it defaults to both

 # author and committer.
 sub git_print_authorship_rows {
        my $co = shift;
 # author and committer.
 sub git_print_authorship_rows {
        my $co = shift;


@@ -4513,8 +4521,8 @@ sub git_patchset_body {
                print "</div>\n"; # class="patch"
        }
 
                print "</div>\n"; # class="patch"
        }
 

-       # for compact combined (--cc) format, with chunk and patch simpliciaction
-       # patchset might be empty, but there might be unprocessed raw lines
+       # for compact combined (--cc) format, with chunk and patch simplification
+       # the patchset might be empty, but there might be unprocessed raw lines

        for (++$patch_idx if $patch_number > 0;
             $patch_idx < @$difftree;
             ++$patch_idx) {
        for (++$patch_idx if $patch_number > 0;
             $patch_idx < @$difftree;
             ++$patch_idx) {


@@ -5192,15 +5200,15 @@ sub git_summary {
 }
 
 sub git_tag {
 }
 
 sub git_tag {

-       my $head = git_get_head_hash($project);
-       git_header_html();
-       git_print_page_nav('','', $head,undef,$head);

        my %tag = parse_tag($hash);
 
        if (! %tag) {
                die_error(404, "Unknown tag object");
        }
 
        my %tag = parse_tag($hash);
 
        if (! %tag) {
                die_error(404, "Unknown tag object");
        }
 

+       my $head = git_get_head_hash($project);
+       git_header_html();
+       git_print_page_nav('','', $head,undef,$head);

        git_print_header_div('commit', esc_html($tag{'name'}), $hash);
        print "<div class=\"title_text\">\n" .
              "<table class=\"object_header\">\n" .
        git_print_header_div('commit', esc_html($tag{'name'}), $hash);
        print "<div class=\"title_text\">\n" .
              "<table class=\"object_header\">\n" .