From: Greg Ames <gregames@apache.org>
Date: Sat, 27 Aug 2011 20:11:16 +0000 (+0000)
Subject: reverting.  got feedback that maybe we don't want to merge 4-5,1-2 into 1-5
X-Git-Tag: 2.3.15~332
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=815caa5657deb15a224bfbcb99de25208f43975c;p=thirdparty%2Fapache%2Fhttpd.git

reverting.  got feedback that maybe we don't want to merge 4-5,1-2 into 1-5


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

diff --git a/modules/http/byterange_filter.c b/modules/http/byterange_filter.c
index e132574d6b2..046aa51d779 100644
--- a/modules/http/byterange_filter.c
+++ b/modules/http/byterange_filter.c
@@ -532,9 +532,7 @@ static int ap_set_byterange(request_rec *r, apr_off_t clength,
         }
         in_merge = 0;
 
-        AP_DEBUG_ASSERT((start <= end) && (ostart <= oend));
-        
-        if (start-1 < oend) {
+        if (!(end <= ostart || start-1 >= oend)) {
             if (start < ostart) {
                 ostart = start;
                 reversals++;