Commit f422e35e authored by Jim Jagielski's avatar Jim Jagielski
Browse files

More merge fixes... 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162165 13f79535-47bb-0310-9956-ffa450edef68
parent 1514e64b

modules/http/byterange_filter.c

+6 −1
Changes for modules/http/byterange_filter.c: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -548,6 +548,7 @@ static int ap_set_byterange(request_rec *r, apr_off_t clength, 
        }

        in_merge = 0;

        

        if !(iend-1 < ostart || start-1 > oend) {

            if (start < ostart) {

                ostart = start;

                reversals++;
@@ -563,7 +564,7 @@ static int ap_set_byterange(request_rec *r, apr_off_t clength, 
            else if (end > ostart && end <= oend) {

                in_merge = 1;

            }



        }

        if (in_merge) {

            overlaps++;

            continue;
@@ -574,6 +575,10 @@ static int ap_set_byterange(request_rec *r, apr_off_t clength, 
            idx = (indexes_t *)apr_array_push(indexes);

            idx->start = ostart;

            idx->end = oend;

            /* new set again */

            in_merge = 1;

            ostart = start;

            oend = end;

            num_ranges++;

        }

    }