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 e132574d6b21d12bde7d28a2d6aec0a719645a5f..046aa51d779920244dc7bf8a50de90a09d440a83 100644 (file)
--- 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++;