[PATCH] gitweb: Send XHTML as 'application/xhtml+xml' where possible
- From
Alp Toker <alp@atoker.com>
- Date
- Jul 9, 2006, 09:41 UTC
- Message-ID
- <11524381182709-git-send-email-alp@atoker.com>
"The 'text/html' media type [RFC2854] is primarily for HTML, not for XHTML. In general, this media type is NOT suitable for XHTML."
This patch makes gitweb use content negotiation to conservatively send pages as Content-Type 'application/xhtml+xml' when the user agent explicitly claims to support it.
It falls back to 'text/html' even if the user agent claims to support 'application/xhtml+xml' by means of a glob in order to work around an insidious Internet Explorer bug.
Signed-off-by: Alp Toker <alp@atoker.com> --- gitweb/gitweb.cgi | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gitweb/gitweb.cgi b/gitweb/gitweb.cgi index 3e2790c..3206435 100755 --- a/gitweb/gitweb.cgi +++ b/gitweb/gitweb.cgi @@ -290,7 +290,8 @@ sub git_header_html { } } } - print $cgi->header(-type=>'text/html', -charset => 'utf-8', -status=> $status, -expires => $expires); + my $content_type = ($cgi->http('HTTP_ACCEPT') =~ m/(,|;|\s|^)application\/xhtml\+xml(,|;|\s|$)/ && $cgi->Accept('application/xhtml+xml') ne 0) ? 'application/xhtml+xml' : 'text/html'; + print $cgi->header(-type=>$content_type, -charset => 'utf-8', -status=> $status, -expires => $expires); print <<EOF; <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> @@ -298,7 +299,7 @@ sub git_header_html { <!-- git web interface v$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="text/html; charset=utf-8"/> +<meta http-equiv="content-type" content="$content_type; charset=utf-8"/> <meta name="robots" content="index, nofollow"/> <title>$title</title> <link rel="stylesheet" type="text/css" href="$stylesheet"/>
-- 1.4.1.gbe4c7