summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2011-08-25 18:35:55 +0000
committerJim Jagielski <jim@apache.org>2011-08-25 18:35:55 +0000
commit1792900eb6c70132278dd5b70c9f702375d5bbee (patch)
treeace3e0448730ea8f982c9807f6d557aa24e8bc8f
parentb1d0fe9cd64595b589e7b8b94629e790e7a65ad9 (diff)
downloadhttpd-1792900eb6c70132278dd5b70c9f702375d5bbee.tar.gz
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
-rw-r--r--modules/http/byterange_filter.c4
1 files changed, 2 insertions, 2 deletions
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) {