Author: rhuijben
Date: Thu Nov 12 13:28:21 2015
New Revision: 1714043
URL: http://svn.apache.org/viewvc?rev=1714043&view=rev
Log:
Following up on r1714040 fix a few more cases where we forgot len
when SERF_BUCKET_READ_ERROR(status) would return false.
* buckets/bwtp_buckets.c
(bwtp_incoming_read): Set length to 0 on semi-failures.
* buckets/response_buckets.c
(serf_response_readline): Set length to 0 on semi-failures.
Modified:
serf/trunk/buckets/bwtp_buckets.c
serf/trunk/buckets/response_buckets.c
Modified: serf/trunk/buckets/bwtp_buckets.c
URL:
http://svn.apache.org/viewvc/serf/trunk/buckets/bwtp_buckets.c?rev=1714043&r1=1714042&r2=1714043&view=diff
==============================================================================
--- serf/trunk/buckets/bwtp_buckets.c (original)
+++ serf/trunk/buckets/bwtp_buckets.c Thu Nov 12 13:28:21 2015
@@ -558,9 +558,7 @@ static apr_status_t bwtp_incoming_read(s
rv = wait_for_body(bucket, ctx);
if (rv) {
/* It's not possible to have read anything yet! */
- if (APR_STATUS_IS_EOF(rv) || APR_STATUS_IS_EAGAIN(rv)) {
- *len = 0;
- }
+ *len = 0;
return rv;
}
Modified: serf/trunk/buckets/response_buckets.c
URL:
http://svn.apache.org/viewvc/serf/trunk/buckets/response_buckets.c?rev=1714043&r1=1714042&r2=1714043&view=diff
==============================================================================
--- serf/trunk/buckets/response_buckets.c (original)
+++ serf/trunk/buckets/response_buckets.c Thu Nov 12 13:28:21 2015
@@ -509,6 +509,7 @@ static apr_status_t serf_response_readli
status = wait_for_body(bucket, ctx);
if (status) {
+ *len = 0;
goto fake_eof;
}