kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

gitweb: remove invalid http-equiv="content-type" 

Before this change, gitweb would generate pages which included:

	<meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8"/>

When a meta's http-equiv equals "content-type", the http-equiv is said
to be in the "Encoding declaration state". According to the HTML
Standard,

	The Encoding declaration state may be used in HTML documents,
	but elements with an http-equiv attribute in that state must not
	be used in XML documents.

	Source: <https://html.spec.whatwg.org/multipage/semantics.html#attr-meta-http-equiv-content-type>

This change removes that meta element since gitweb always generates XML
documents.

Signed-off-by: Jason Yundt <jason@jasonyundt.email>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jason Yundt 3 years ago committed by Junio C Hamano
parent
943fd02769
commit
a262585d81
2 changed files with 14 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      gitweb/gitweb.perl
  2. 13
      t/t9502-gitweb-standalone-parse-output.sh

4
gitweb/gitweb.perl
Unescape View File

@ -4213,8 +4213,7 @@ sub git_header_html { @@ -4213,8 +4213,7 @@ sub git_header_html {
my %opts = @_;

my $title = get_page_title();
my $content_type = get_content_type_html();
print $cgi->header(-type=>$content_type, -charset => 'utf-8',
print $cgi->header(-type=>get_content_type_html(), -charset => 'utf-8',
-status=> $status, -expires => $expires)
unless ($opts{'-no_http_header'});
my $mod_perl_version = $ENV{'MOD_PERL'} ? " $ENV{'MOD_PERL'}" : '';
@ -4225,7 +4224,6 @@ sub git_header_html { @@ -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 core binaries version $git_version -->
<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="robots" content="index, nofollow"/>
<title>$title</title>

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

@ -207,4 +207,17 @@ test_expect_success 'xss checks' ' @@ -207,4 +207,17 @@ test_expect_success 'xss checks' '
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

Write Preview
Loading…
Cancel
Save