Return-Path: 
 <cvs-return-30201-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 79463 invoked from network); 27 May 2008 20:53:34 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 27 May 2008 20:53:34 -0000
Received: (qmail 38773 invoked by uid 500); 27 May 2008 20:53:35 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 38712 invoked by uid 500); 27 May 2008 20:53:35 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 38703 invoked by uid 99); 27 May 2008 20:53:35 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 May 2008 13:53:35 -0700
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, 27 May 2008 20:52:45 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0CA592388A14; Tue, 27 May 2008 13:53:02 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r660699 - /httpd/httpd/branches/2.2.x/CHANGES
Date: Tue, 27 May 2008 20:53:01 -0000
To: cvs@httpd.apache.org
From: fielding@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080527205302.0CA592388A14@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: fielding
Date: Tue May 27 13:53:01 2008
New Revision: 660699

URL: http://svn.apache.org/viewvc?rev=660699&view=rev
Log:
another merged with sync of ab

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=660699&r1=660698&r2=660699&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue May 27 13:53:01 2008
@@ -19,6 +19,9 @@
      accuracy of calculation due to type casts. PR 44878, 44931.
      [Roy T. Fielding]
 
+  *) ab: Add -r option to continue after socket receive errors.
+     [Filip Hanik <devlist hanik.com>]
+
   *) core: Do not allow Options ALL if not all options are allowed to be
      overwritten. PR 44262 [Michał Grzędzicki <lazy iq.pl>]