]> granicus.if.org Git - apache/commitdiff
remove merge hit r1161778
authorJim Jagielski <jim@apache.org>
Fri, 26 Aug 2011 17:06:19 +0000 (17:06 +0000)
committerJim Jagielski <jim@apache.org>
Fri, 26 Aug 2011 17:06:19 +0000 (17:06 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162168 13f79535-47bb-0310-9956-ffa450edef68

modules/http/byterange_filter.c

index 84c4ed1ffe173b62560d953c55bac6b7cd8022c0..09bd9a2c340d59ee3ee62d9cbac5d5d751579a88 100644 (file)
@@ -205,9 +205,6 @@ static apr_status_t copy_brigade_range(apr_bucket_brigade *bb,
                 off_last += start64 - off_first;
                 copy = out_first;
             }
-            else {
-                APR_BRIGADE_INSERT_TAIL(bbout, copy);
-            }
             if (end64 - off_last != (apr_uint64_t)e->length) {
                 rv = apr_bucket_split(copy, (apr_size_t)(end64 + 1 - off_last));
                 if (rv == APR_ENOTIMPL) {