You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2011/08/25 20:35:56 UTC

svn commit: r1161682 - /httpd/httpd/trunk/modules/http/byterange_filter.c

Author: jim
Date: Thu Aug 25 18:35:55 2011
New Revision: 1161682

URL: http://svn.apache.org/viewvc?rev=1161682&view=rev
Log:
Save a few cycles... do reason to set in_merge if we already have

Modified:
    httpd/httpd/trunk/modules/http/byterange_filter.c

Modified: httpd/httpd/trunk/modules/http/byterange_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/byterange_filter.c?rev=1161682&r1=1161681&r2=1161682&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/byterange_filter.c (original)
+++ httpd/httpd/trunk/modules/http/byterange_filter.c Thu Aug 25 18:35:55 2011
@@ -578,14 +578,14 @@ static int ap_set_byterange(request_rec 
             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) {