gitweb.cgi: fix "comitter_tz" typo in feed

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index bfa2d79cb1a2a1dd7fdbeb6d4d25e873c9ea9440fe2cf40abcedd123b4b07276..5c9cfee6343d2a4d801d247d809bdd659426f9891df00145c65f0fddcef6416f 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -54,6 +54,11 @@ sub evaluate_uri {
        # to build the base URL ourselves:
        our $path_info = decode_utf8($ENV{"PATH_INFO"});
        if ($path_info) {
+               # $path_info has already been URL-decoded by the web server, but
+               # $my_url and $my_uri have not. URL-decode them so we can properly
+               # strip $path_info.
+               $my_url = unescape($my_url);
+               $my_uri = unescape($my_uri);
                if ($my_url =~ s,\Q$path_info\E$,, &&
                    $my_uri =~ s,\Q$path_info\E$,, &&
                    defined $ENV{'SCRIPT_NAME'}) {
@@ -4495,6 +4500,16 @@ sub git_print_log {
                        next;
                }
 
+               if ($line =~ m,\s*([a-z]*link): (https?://\S+),i) {
+                       if (! $opts{'-remove_signoff'}) {
+                               print "<span class=\"signoff\">" . esc_html($1) . ": " .
+                                       "<a href=\"" . esc_html($2) . "\">" . esc_html($2) . "</a>" .
+                                       "</span><br/>\n";
+                               $skip_blank_line = 1;
+                       }
+                       next;
+               }
+
                # print only one empty line
                # do not print empty line after signoff
                if ($line eq "") {
@@ -8014,7 +8029,7 @@ sub git_feed {
                %latest_commit = %{$commitlist[0]};
                my $latest_epoch = $latest_commit{'committer_epoch'};
                exit_if_unmodified_since($latest_epoch);
-               %latest_date = parse_date($latest_epoch, $latest_commit{'comitter_tz'});
+               %latest_date = parse_date($latest_epoch, $latest_commit{'committer_tz'});
        }
        print $cgi->header(
                -type => $content_type,