You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gr...@apache.org on 2011/08/27 22:11:16 UTC
svn commit: r1162436 - /httpd/httpd/trunk/modules/http/byterange_filter.c
Author: gregames
Date: Sat Aug 27 20:11:16 2011
New Revision: 1162436
URL: http://svn.apache.org/viewvc?rev=1162436&view=rev
Log:
reverting. got feedback that maybe we don't want to merge 4-5,1-2 into 1-5
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=1162436&r1=1162435&r2=1162436&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/byterange_filter.c (original)
+++ httpd/httpd/trunk/modules/http/byterange_filter.c Sat Aug 27 20:11:16 2011
@@ -532,9 +532,7 @@ static int ap_set_byterange(request_rec
}
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++;