Commit b962dfe0 authored by Rainer Jung's avatar Rainer Jung
Browse files

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
parent aafb20bc

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- 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]

STATUS

+0 −6
Original line number Diff line number Diff line
@@ -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:

modules/http/byterange_filter.c

+1 −1
Original line number Diff line number Diff line
@@ -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;