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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1445101 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index c618ed7f115d586bde108df8a092db180c6ba9a5..c9ceee090bcfb23dadd0077d284bf05acab955e8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 

diff --git a/STATUS b/STATUS
index dc3eb5903ef1e1cfb8c576ebf5268b5a570c5ab3..5a82a0488873a5ff46974df5d9b00825423c9451 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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:

diff --git a/modules/http/byterange_filter.c b/modules/http/byterange_filter.c
index 67a516ae3d1e90c13b5b7b54bc2fd85f0da51806..a0bb62e52589a9104db4ad0439600ab52eeb5814 100644 (file)
--- a/modules/http/byterange_filter.c
+++ b/modules/http/byterange_filter.c
@@ -506,7 +506,7 @@ static int ap_set_byterange(request_rec *r, apr_off_t clength,
                  *   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;