Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 87920 invoked from network); 20 Nov 2007 14:01:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Nov 2007 14:01:54 -0000 Received: (qmail 43698 invoked by uid 500); 20 Nov 2007 14:01:40 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 43647 invoked by uid 500); 20 Nov 2007 14:01:40 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 43636 invoked by uid 99); 20 Nov 2007 14:01:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Nov 2007 06:01:40 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Nov 2007 14:01:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 44F501A9838; Tue, 20 Nov 2007 06:01:32 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r596675 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/generators/mod_autoindex.c Date: Tue, 20 Nov 2007 14:01:31 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071120140132.44F501A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jim Date: Tue Nov 20 06:01:28 2007 New Revision: 596675 URL: http://svn.apache.org/viewvc?rev=596675&view=rev Log: Merge r593816 from trunk: * Generate valid XHTML output by adding the xhtml namespace. PR: 43649 Submitted by: Jose Kahan Reviewed by: rpluem Submitted by: rpluem Reviewed by: jim Modified: httpd/httpd/branches/2.2.x/CHANGES httpd/httpd/branches/2.2.x/STATUS httpd/httpd/branches/2.2.x/modules/generators/mod_autoindex.c Modified: httpd/httpd/branches/2.2.x/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=596675&r1=596674&r2=596675&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original) +++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Nov 20 06:01:28 2007 @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.2.7 + *) mod_autoindex: Generate valid XHTML output by adding the xhtml + namespace. PR 43649 [Jose Kahan ] + *) mod_ldap: Give callers a reference to data copied into the request pool instead of references directly into the cache PR 43786 [Eric Covener] Modified: httpd/httpd/branches/2.2.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=596675&r1=596674&r2=596675&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/STATUS (original) +++ httpd/httpd/branches/2.2.x/STATUS Tue Nov 20 06:01:28 2007 @@ -109,13 +109,6 @@ niq says: done jim: +1 - * mod_autoindex: Generate valid XHTML output by adding the xhtml namespace. - Trunk version of patch: - http://svn.apache.org/viewcvs.cgi?rev=593816&view=rev - Backport version for 2.2.x of patch: - Trunk version of patch works - +1: rpluem, trawick, jim - * core: Avoid some unexpected connection closes by telling the client that the connection is not persistent if the MPM process handling the request is already exiting when the response header is built. Modified: httpd/httpd/branches/2.2.x/modules/generators/mod_autoindex.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/generators/mod_autoindex.c?rev=596675&r1=596674&r2=596675&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/modules/generators/mod_autoindex.c (original) +++ httpd/httpd/branches/2.2.x/modules/generators/mod_autoindex.c Tue Nov 20 06:01:28 2007 @@ -160,9 +160,18 @@ d = (autoindex_config_rec *) ap_get_module_config(r->per_dir_config, &autoindex_module); - ap_rvputs(r, xhtml ? DOCTYPE_XHTML_1_0T : DOCTYPE_HTML_3_2, - "\n \n Index of ", title, - "\n", NULL); + if (xhtml) { + ap_rvputs(r, DOCTYPE_XHTML_1_0T, + "\n" + "\n Index of ", title, + "\n", NULL); + } else { + ap_rvputs(r, DOCTYPE_HTML_3_2, + "\n \n" + "Index of ", title, + "\n", NULL); + } + if (d->style_sheet != NULL) { ap_rvputs(r, " style_sheet, "\" type=\"text/css\"", xhtml ? " />\n" : ">\n", NULL);