rbb 01/08/08 15:24:04
Modified: modules/http http_protocol.c
buckets apr_brigade.c
include apr_buckets.h
Log:
Remove the block argument from apr_brigade_partition. This looked good
in theory, but in reality, we should just rely on the timeouts to handle
this.
Revision Changes Path
1.348 +3 -3 httpd-2.0/modules/http/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- http_protocol.c 2001/08/08 15:42:08 1.347
+++ http_protocol.c 2001/08/08 22:24:04 1.348
@@ -656,7 +656,7 @@
### READBYTES bytes, and we wouldn't have to do any work.
*/
- apr_brigade_partition(ctx->b, *readbytes, &e, APR_NONBLOCK_READ);
+ apr_brigade_partition(ctx->b, *readbytes, &e);
APR_BRIGADE_CONCAT(b, ctx->b);
ctx->b = apr_brigade_split(b, e);
apr_brigade_length(b, 1, &total);
@@ -2400,12 +2400,12 @@
/* these calls to apr_brigade_partition() should theoretically
* never fail because of the above call to apr_brigade_length(),
* but what the heck, we'll check for an error anyway */
- if ((rv = apr_brigade_partition(bb, range_start, &ec,
APR_BLOCK_READ)) != APR_SUCCESS) {
+ if ((rv = apr_brigade_partition(bb, range_start, &ec)) !=
APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
PARTITION_ERR_FMT, range_start, clength);
continue;
}
- if ((rv = apr_brigade_partition(bb, range_end+1, &e2,
APR_BLOCK_READ)) != APR_SUCCESS) {
+ if ((rv = apr_brigade_partition(bb, range_end+1, &e2)) !=
APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
PARTITION_ERR_FMT, range_end+1, clength);
continue;
1.22 +3 -4 apr-util/buckets/apr_brigade.c
Index: apr_brigade.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_brigade.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- apr_brigade.c 2001/08/08 19:53:21 1.21
+++ apr_brigade.c 2001/08/08 22:24:04 1.22
@@ -129,8 +129,7 @@
APU_DECLARE(apr_status_t) apr_brigade_partition(apr_bucket_brigade *b,
apr_off_t point,
- apr_bucket **after_point,
- apr_read_type_e block)
+ apr_bucket **after_point)
{
apr_bucket *e;
const char *s;
@@ -150,7 +149,7 @@
if ((point > (apr_size_t)(-1)) && (e->length == (apr_size_t)(-1))) {
/* XXX: point is too far out to simply split this bucket,
* we must fix this bucket's size and keep going... */
- if ((rv = apr_bucket_read(e, &s, &len, block)) != APR_SUCCESS) {
+ if ((rv = apr_bucket_read(e, &s, &len, APR_BLOCK_READ)) !=
APR_SUCCESS) {
*after_point = e;
return rv;
}
@@ -167,7 +166,7 @@
/* if the bucket cannot be split, we must read from it,
* changing its type to one that can be split */
- if ((rv = apr_bucket_read(e, &s, &len, block)) != APR_SUCCESS) {
+ if ((rv = apr_bucket_read(e, &s, &len, APR_BLOCK_READ)) !=
APR_SUCCESS) {
*after_point = e;
return rv;
}
1.107 +1 -2 apr-util/include/apr_buckets.h
Index: apr_buckets.h
===================================================================
RCS file: /home/cvs/apr-util/include/apr_buckets.h,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- apr_buckets.h 2001/08/08 15:40:35 1.106
+++ apr_buckets.h 2001/08/08 22:24:04 1.107
@@ -652,8 +652,7 @@
*/
APU_DECLARE(apr_status_t) apr_brigade_partition(apr_bucket_brigade *b,
apr_off_t point,
- apr_bucket **after_point,
- apr_read_type_e block);
+ apr_bucket **after_point);
#if APR_NOT_DONE_YET
/**
