From: Jim Jagielski <jim@apache.org>
Date: Fri, 26 Aug 2011 17:06:19 +0000 (+0000)
Subject: remove merge hit r1161778
X-Git-Tag: 2.3.15~343
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a15fae1fd2ba07a70d211b6cfb6fc8d755ce593;p=thirdparty%2Fapache%2Fhttpd.git

remove merge hit r1161778

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

diff --git a/modules/http/byterange_filter.c b/modules/http/byterange_filter.c
index 84c4ed1ffe1..09bd9a2c340 100644
--- a/modules/http/byterange_filter.c
+++ b/modules/http/byterange_filter.c
@@ -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) {