From: Jim Jagielski <jim@apache.org>
Date: Thu, 25 Aug 2011 18:35:55 +0000 (+0000)
Subject: Save a few cycles... do reason to set in_merge if we already have
X-Git-Tag: 2.3.15~354
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1792900eb6c70132278dd5b70c9f702375d5bbee;p=apache

Save a few cycles... do reason to set in_merge if we already have

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

diff --git a/modules/http/byterange_filter.c b/modules/http/byterange_filter.c
index bba0a8a66e..48eaa3388c 100644
--- a/modules/http/byterange_filter.c
+++ b/modules/http/byterange_filter.c
@@ -578,14 +578,14 @@ static int ap_set_byterange(request_rec *r)
             ostart = start;
             in_merge = 1;
         }
-        if (start < oend) {
+        else if (start < oend) {
             in_merge = 1;
         }
         if ((end-1) >= oend) {
             oend = end;
             in_merge = 1;
         }
-        if (end > ostart && end < oend) {
+        else if (end > ostart && end < oend) {
             in_merge = 1;
         }
         if (in_merge) {