From cvs-return-32658-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org Sun May 10 14:43:15 2009 Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 14854 invoked from network); 10 May 2009 14:43:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 May 2009 14:43:14 -0000 Received: (qmail 30061 invoked by uid 500); 10 May 2009 14:43:14 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 30007 invoked by uid 500); 10 May 2009 14:43:14 -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 29998 invoked by uid 99); 10 May 2009 14:43:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 10 May 2009 14:43:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 10 May 2009 14:43:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 20EA923889D0; Sun, 10 May 2009 14:42:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r773345 - /httpd/httpd/branches/2.2.x/STATUS Date: Sun, 10 May 2009 14:42:51 -0000 To: cvs@httpd.apache.org From: jorton@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090510144252.20EA923889D0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jorton Date: Sun May 10 14:42:51 2009 New Revision: 773345 URL: http://svn.apache.org/viewvc?rev=773345&view=rev Log: Propose CVE-2009-1195 backport. Modified: httpd/httpd/branches/2.2.x/STATUS Modified: httpd/httpd/branches/2.2.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=773345&r1=773344&r2=773345&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/STATUS (original) +++ httpd/httpd/branches/2.2.x/STATUS Sun May 10 14:42:51 2009 @@ -167,6 +167,15 @@ http://svn.apache.org/viewvc?view=rev&revision=771587 +1: wrowe + * CVE-2009-1195 security fix for Includes merging. + trunk version of patch: + http://svn.apache.org/viewvc?rev=772997&view=rev + http://svn.apache.org/viewvc?rev=773322&view=rev + http://svn.apache.org/viewvc?rev=773342&view=rev + 2.2.x patch: + http://people.apache.org/~jorton/2.2.x-CVE-2009-1195.patch + (unmodified merge from trunk + CHANGES entry) + +1: jorton PATCHES/ISSUES THAT ARE STALLED