From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alp Toker Subject: [PATCH] gitweb: Send XHTML as 'application/xhtml+xml' where possible Date: Sun, 09 Jul 2006 15:55:21 +0100 Message-ID: <11524569211631-git-send-email-alp@atoker.com> Reply-To: Alp Toker X-From: git-owner@vger.kernel.org Sun Jul 09 16:55:55 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FzahC-0004rl-OY for gcvg-git@gmane.org; Sun, 09 Jul 2006 16:55:43 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932485AbWGIOz2 (ORCPT ); Sun, 9 Jul 2006 10:55:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932489AbWGIOz2 (ORCPT ); Sun, 9 Jul 2006 10:55:28 -0400 Received: from host-84-9-44-142.bulldogdsl.com ([84.9.44.142]:35854 "EHLO ndesk.org") by vger.kernel.org with ESMTP id S932485AbWGIOz1 (ORCPT ); Sun, 9 Jul 2006 10:55:27 -0400 Received: by ndesk.org (Postfix, from userid 1000) id D245D164CE2; Sun, 9 Jul 2006 15:55:21 +0100 (BST) To: git@vger.kernel.org X-Mailer: git-send-email 1.4.1.gbe4c7 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: "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 appears to implicitly support 'application/xhtml+xml' due to a '*/*' glob, working around an insidious bug in Internet Explorer where sending the correct media type prevents the page from being displayed. Signed-off-by: Alp Toker --- gitweb/gitweb.cgi | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gitweb/gitweb.cgi b/gitweb/gitweb.cgi index 3e2790c..beb8061 100755 --- a/gitweb/gitweb.cgi +++ b/gitweb/gitweb.cgi @@ -290,7 +290,17 @@ sub git_header_html { } } } - print $cgi->header(-type=>'text/html', -charset => 'utf-8', -status=> $status, -expires => $expires); + my $content_type; + # require explicit support from the UA if we are to send the page as + # 'application/xhtml+xml', otherwise send it as plain old 'text/html'. + # we have to do this because MSIE sometimes globs '*/*', pretending to + # support xhtml+xml but choking when it gets what it asked for. + if ($cgi->http('HTTP_ACCEPT') =~ m/(,|;|\s|^)application\/xhtml\+xml(,|;|\s|$)/ && $cgi->Accept('application/xhtml+xml') != 0) { + $content_type = 'application/xhtml+xml'; + } else { + $content_type = 'text/html'; + } + print $cgi->header(-type=>$content_type, -charset => 'utf-8', -status=> $status, -expires => $expires); print < @@ -298,7 +308,7 @@ sub git_header_html { - + $title -- 1.4.1.gbe4c7