svn commit: r1714115 - in /serf/trunk/buckets: bwtp_buckets.c dechunk_buckets.c headers_buckets.c

[rhuijben]

Author: rhuijben
Date: Thu Nov 12 20:21:51 2015
New Revision: 1714115

URL: http://svn.apache.org/viewvc?rev=1714115&view=rev
Log:
Properly set some output arguments of readline on not completely success
return values.

* buckets/bwtp_buckets.c
  (bwtp_incoming_readline): Rename variable and set values to imply no output.

* buckets/dechunk_buckets.c
  (serf_dechunk_readline): Set 'no output' on error.

* buckets/headers_buckets.c
  (serf_headers_readline): Set length on EOF read.

Modified:
    serf/trunk/buckets/bwtp_buckets.c
    serf/trunk/buckets/dechunk_buckets.c
    serf/trunk/buckets/headers_buckets.c

Modified: serf/trunk/buckets/bwtp_buckets.c
URL: 
http://svn.apache.org/viewvc/serf/trunk/buckets/bwtp_buckets.c?rev=1714115&r1=1714114&r2=1714115&view=diff
==============================================================================
--- serf/trunk/buckets/bwtp_buckets.c (original)
+++ serf/trunk/buckets/bwtp_buckets.c Thu Nov 12 20:21:51 2015
@@ -574,11 +574,13 @@ static apr_status_t bwtp_incoming_readli
                                            const char **data, apr_size_t *len)
 {
     incoming_context_t *ctx = bucket->data;
-    apr_status_t rv;
+    apr_status_t status;
 
-    rv = wait_for_body(bucket, ctx);
-    if (rv) {
-        return rv;
+    status = wait_for_body(bucket, ctx);
+    if (status) {
+        *found = SERF_NEWLINE_NONE;
+        *len = 0;
+        return status;
     }
 
     /* Delegate to the stream bucket to do the readline. */

Modified: serf/trunk/buckets/dechunk_buckets.c
URL: 
http://svn.apache.org/viewvc/serf/trunk/buckets/dechunk_buckets.c?rev=1714115&r1=1714114&r2=1714115&view=diff
==============================================================================
--- serf/trunk/buckets/dechunk_buckets.c (original)
+++ serf/trunk/buckets/dechunk_buckets.c Thu Nov 12 20:21:51 2015
@@ -214,6 +214,7 @@ static apr_status_t serf_dechunk_readlin
 
     status = wait_for_chunk(bucket);
     if (status || ctx->state != STATE_CHUNK) {
+        *found = SERF_NEWLINE_NONE;
         *len = 0;
         return status;
     }

Modified: serf/trunk/buckets/headers_buckets.c
URL: 
http://svn.apache.org/viewvc/serf/trunk/buckets/headers_buckets.c?rev=1714115&r1=1714114&r2=1714115&view=diff
==============================================================================
--- serf/trunk/buckets/headers_buckets.c (original)
+++ serf/trunk/buckets/headers_buckets.c Thu Nov 12 20:21:51 2015
@@ -403,6 +403,7 @@ static apr_status_t serf_headers_readlin
     select_value(ctx, data, len);
     if (ctx->state == READ_DONE) {
         *found = SERF_NEWLINE_NONE;
+        *len = 0;
         return APR_EOF;
     }