undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jy/gitweb-no-need-for-meta'

Browse Source 
Remove unneeded <meta http-equiv=content-type...> from gitweb
output.

* jy/gitweb-no-need-for-meta:
  gitweb: remove invalid http-equiv="content-type"
  comment: fix typo
This commit is contained in:
Junio C Hamano 2022-03-21 15:14:24 -07:00
commit bc3838b310
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gitweb/gitweb.perl
View File

@ -4213,8 +4213,7 @@ sub git_header_html {
my %opts = @_; my %opts = @_;
my $title = get_page_title(); my $title = get_page_title();
my $content_type = get_content_type_html(); print $cgi->header(-type=>get_content_type_html(), -charset => 'utf-8',
print $cgi->header(-type=>$content_type, -charset => 'utf-8',
-status=> $status, -expires => $expires) -status=> $status, -expires => $expires)
unless ($opts{'-no_http_header'}); unless ($opts{'-no_http_header'});
my $mod_perl_version = $ENV{'MOD_PERL'} ? " $ENV{'MOD_PERL'}" : ''; my $mod_perl_version = $ENV{'MOD_PERL'} ? " $ENV{'MOD_PERL'}" : '';
@ -4225,7 +4224,6 @@ sub git_header_html {
<!-- git web interface version $version, (C) 2005-2006, Kay Sievers <kay.sievers\@vrfy.org>, Christian Gierke --> <!-- git web interface version $version, (C) 2005-2006, Kay Sievers <kay.sievers\@vrfy.org>, Christian Gierke -->
<!-- git core binaries version $git_version --> <!-- git core binaries version $git_version -->
<head> <head>
<meta http-equiv="content-type" content="$content_type; charset=utf-8"/>
<meta name="generator" content="gitweb/$version git/$git_version$mod_perl_version"/> <meta name="generator" content="gitweb/$version git/$git_version$mod_perl_version"/>
<meta name="robots" content="index, nofollow"/> <meta name="robots" content="index, nofollow"/>
<title>$title</title> <title>$title</title>

15
t/t9502-gitweb-standalone-parse-output.sh
View File

@ -34,7 +34,7 @@ EOF
# #
# This will check that gitweb HTTP header contains proposed filename # This will check that gitweb HTTP header contains proposed filename
# as <basename> with '.tar' suffix added, and that generated tarfile # as <basename> with '.tar' suffix added, and that generated tarfile
# (gitweb message body) has <prefix> as prefix for al files in tarfile # (gitweb message body) has <prefix> as prefix for all files in tarfile
# #
# <prefix> default to <basename> # <prefix> default to <basename>
check_snapshot () { check_snapshot () {
@ -207,4 +207,17 @@ test_expect_success 'xss checks' '
xss "" "$TAG+" xss "" "$TAG+"
' '
no_http_equiv_content_type() {
gitweb_run "$@" &&
! grep -E "http-equiv=['\"]?content-type" gitweb.body
}
# See: <https://html.spec.whatwg.org/dev/semantics.html#attr-meta-http-equiv-content-type>
test_expect_success 'no http-equiv="content-type" in XHTML' '
no_http_equiv_content_type &&
no_http_equiv_content_type "p=.git" &&
no_http_equiv_content_type "p=.git;a=log" &&
no_http_equiv_content_type "p=.git;a=tree"
'
test_done test_done