Fix overridable written with an extra 'e'

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 28833a8c90c8092f674e48ee6a6549768f3b8f048616f3347070115c0ea271df..c8457ccfa2bfe559710b5b21e71e8697154506e99bce91a4331efe47eb8ce40f 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -178,6 +178,14 @@ our %known_snapshot_formats = (
                'format' => 'tar',
                'compressor' => ['bzip2']},
 
                'format' => 'tar',
                'compressor' => ['bzip2']},
 

+       'txz' => {
+               'display' => 'tar.xz',
+               'type' => 'application/x-xz',
+               'suffix' => '.tar.xz',
+               'format' => 'tar',
+               'compressor' => ['xz'],
+               'disabled' => 1},
+

        'zip' => {
                'display' => 'zip',
                'type' => 'application/x-zip',
        'zip' => {
                'display' => 'zip',
                'type' => 'application/x-zip',


@@ -190,6 +198,7 @@ our %known_snapshot_formats = (
 our %known_snapshot_format_aliases = (
        'gzip'  => 'tgz',
        'bzip2' => 'tbz2',
 our %known_snapshot_format_aliases = (
        'gzip'  => 'tgz',
        'bzip2' => 'tbz2',

+       'xz'    => 'txz',

 
        # backward compatibility: legacy gitweb config support
        'x-gzip' => undef, 'gz' => undef,
 
        # backward compatibility: legacy gitweb config support
        'x-gzip' => undef, 'gz' => undef,


@@ -407,7 +416,7 @@ sub gitweb_get_feature {
                @{$feature{$name}{'default'}});
        if (!$override) { return @defaults; }
        if (!defined $sub) {
                @{$feature{$name}{'default'}});
        if (!$override) { return @defaults; }
        if (!defined $sub) {

-               warn "feature $name is not overrideable";
+               warn "feature $name is not overridable";

                return @defaults;
        }
        return $sub->(@defaults);
                return @defaults;
        }
        return $sub->(@defaults);


@@ -1516,10 +1525,10 @@ sub format_subject_html {
                $long =~ s/[[:cntrl:]]/?/g;
                return $cgi->a({-href => $href, -class => "list subject",
                                -title => to_utf8($long)},
                $long =~ s/[[:cntrl:]]/?/g;
                return $cgi->a({-href => $href, -class => "list subject",
                                -title => to_utf8($long)},

-                      esc_html($short) . $extra);
+                      esc_html($short)) . $extra;

        } else {
                return $cgi->a({-href => $href, -class => "list subject"},
        } else {
                return $cgi->a({-href => $href, -class => "list subject"},

-                      esc_html($long)  . $extra);
+                      esc_html($long)) . $extra;

        }
 }
 
        }
 }
 


@@ -5182,10 +5191,10 @@ sub git_snapshot {
                die_error(400, "Invalid snapshot format parameter");
        } elsif (!exists($known_snapshot_formats{$format})) {
                die_error(400, "Unknown snapshot format");
                die_error(400, "Invalid snapshot format parameter");
        } elsif (!exists($known_snapshot_formats{$format})) {
                die_error(400, "Unknown snapshot format");

-       } elsif (!grep($_ eq $format, @snapshot_fmts)) {
-               die_error(403, "Unsupported snapshot format");

        } elsif ($known_snapshot_formats{$format}{'disabled'}) {
                die_error(403, "Snapshot format not allowed");
        } elsif ($known_snapshot_formats{$format}{'disabled'}) {
                die_error(403, "Snapshot format not allowed");

+       } elsif (!grep($_ eq $format, @snapshot_fmts)) {
+               die_error(403, "Unsupported snapshot format");

        }
 
        if (!defined $hash) {
        }
 
        if (!defined $hash) {