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/29 17:59:39 UTC
svn commit: r1162885 -
/httpd/httpd/branches/2.2.x/modules/http/byterange_filter.c
Author: jim
Date: Mon Aug 29 15:59:39 2011
New Revision: 1162885
URL: http://svn.apache.org/viewvc?rev=1162885&view=rev
Log:
Remove dead, wrong code
Modified:
httpd/httpd/branches/2.2.x/modules/http/byterange_filter.c
Modified: httpd/httpd/branches/2.2.x/modules/http/byterange_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/http/byterange_filter.c?rev=1162885&r1=1162884&r2=1162885&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/http/byterange_filter.c (original)
+++ httpd/httpd/branches/2.2.x/modules/http/byterange_filter.c Mon Aug 29 15:59:39 2011
@@ -137,7 +137,6 @@ static apr_status_t copy_brigade_range(a
if (off_first != start64) {
rv = apr_bucket_split(copy, (apr_size_t)(start64 - off_first));
if (rv == APR_ENOTIMPL) {
- int i;
rv = apr_bucket_read(copy, &s, &len, APR_BLOCK_READ);
if (rv != APR_SUCCESS) {
apr_brigade_cleanup(bbout);
@@ -148,14 +147,8 @@ static apr_status_t copy_brigade_range(a
* of shorter length. So read and delete until we reached
* the correct bucket for splitting.
*/
- i = 0;
while (start64 - off_first > (apr_uint64_t)copy->length) {
- apr_bucket *tmp;
- /* don't allow inf. spin */
- if (i++ >= 99999)
- return APR_EINVAL;
-
- tmp = APR_BUCKET_NEXT(copy);
+ apr_bucket *tmp = APR_BUCKET_NEXT(copy);
off_first += (apr_uint64_t)copy->length;
APR_BUCKET_REMOVE(copy);
apr_bucket_destroy(copy);