Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1445101 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
 modules/http/byterange_filter.c
Date: Tue, 12 Feb 2013 11:05:08 -0000
To: cvs@httpd.apache.org
From: rjung@apache.org
Message-Id: <20130212110508.CA563238896F@eris.apache.org>

Author: rjung
Date: Tue Feb 12 11:05:08 2013
New Revision: 1445101

URL: http://svn.apache.org/r1445101
Log:
byterange filter: Remove apr 1.3 dependency by
dropping apr_array_clear. The dependency was
introduced by a backport in 2.2.22.

Submitted by: covener
Reviewed by: rjung, trawick

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/http/byterange_filter.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1445101&r1=1445100&r2=1445101&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Feb 12 11:05:08 2013
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.24
 
+  *) core: Remove unintentional APR 1.3 dependency introduced with
+     Apache 2.2.22. [Eric Covener]
+
   *) core: Use a TLS 1.0 close_notify alert for internal dummy connection if
      the chosen listener is configured for https. [Joe Orton]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1445101&r1=1445100&r2=1445101&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Feb 12 11:05:08 2013
@@ -94,12 +94,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * byterange filter: Remove apr 1.3 dependency by dropping apr_array_clear
-     trunk patch: n/a
-     2.4.x patch: n/a
-     2.2.x patch: http://people.apache.org/~covener/patches/2.2.x-byterange-table_clear.diff
-     +1: covener, rjung, trawick
-
   * mod_cache: Allow providers to decide whether to cache responses with code
     206.
     Trunk version of patch:

Modified: httpd/httpd/branches/2.2.x/modules/http/byterange_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/http/byterange_filter.c?rev=1445101&r1=1445100&r2=1445101&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/http/byterange_filter.c (original)
+++ httpd/httpd/branches/2.2.x/modules/http/byterange_filter.c Tue Feb 12 11:05:08 2013
@@ -506,7 +506,7 @@ static int ap_set_byterange(request_rec 
                  *   return as a single range: 0-
                  */
                 if (start == 0) {
-                    apr_array_clear(*indexes);
+                    (*indexes)->nelts = 0;
                     idx = (indexes_t *)apr_array_push(*indexes);
                     idx->start = start;
                     idx->end = end;