Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 21068 invoked from network); 5 Oct 2010 19:35:45 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 Oct 2010 19:35:45 -0000 Received: (qmail 89367 invoked by uid 500); 5 Oct 2010 19:35:44 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 89280 invoked by uid 500); 5 Oct 2010 19:35:44 -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 89272 invoked by uid 99); 5 Oct 2010 19:35:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Oct 2010 19:35:44 +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; Tue, 05 Oct 2010 19:35:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DFF2223888D2; Tue, 5 Oct 2010 19:35:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1004782 - /httpd/httpd/branches/2.2.x/CHANGES Date: Tue, 05 Oct 2010 19:35:20 -0000 To: cvs@httpd.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101005193520.DFF2223888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Tue Oct 5 19:35:20 2010 New Revision: 1004782 URL: http://svn.apache.org/viewvc?rev=1004782&view=rev Log: Revert unassociated CHANGES entry from r1004734 Modified: httpd/httpd/branches/2.2.x/CHANGES Modified: httpd/httpd/branches/2.2.x/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1004782&r1=1004781&r2=1004782&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original) +++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Oct 5 19:35:20 2010 @@ -10,11 +10,6 @@ Changes with Apache 2.2.17 *) mod_headers: Enable multi-match-and-replace edit option PR 46594 [Nick Kew] - *) mod_reqtimeout: Do not wrongly enforce timeouts for mod_proxy's backend - connections and other protocol handlers (like mod_ftp). Enforce the - timeout for AP_MODE_GETLINE. If there is a timeout, shorten the lingering - close time from 30 to 2 seconds. [Stefan Fritsch] - *) mod_log_config: Make ${cookie}C correctly match whole cookie names instead of substrings. PR 28037. [Dan Franklin , Stefan Fritsch]