]> granicus.if.org Git - apache/commitdiff
Optimize... and break if we get eg 200-100
authorJim Jagielski <jim@apache.org>
Thu, 25 Aug 2011 18:33:26 +0000 (18:33 +0000)
committerJim Jagielski <jim@apache.org>
Thu, 25 Aug 2011 18:33:26 +0000 (18:33 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161681 13f79535-47bb-0310-9956-ffa450edef68

modules/http/byterange_filter.c

index 63e46798f6d1250a4a4498092660836158e32cb5..bba0a8a66e253a14dcd9b6d25008a8b5f63e2034 100644 (file)
@@ -566,6 +566,9 @@ static int ap_set_byterange(request_rec *r)
             break;
         }
         end = number;
+        if (start > end) {
+            break;
+        }
         if (!in_merge) {
             ostart = start;
             oend = end;
@@ -575,7 +578,7 @@ static int ap_set_byterange(request_rec *r)
             ostart = start;
             in_merge = 1;
         }
-        if (start > ostart && start < oend) {
+        if (start < oend) {
             in_merge = 1;
         }
         if ((end-1) >= oend) {