From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 7 Sep 2010 16:22:54 +0000 (+0200)
Subject: chunky parser: only rewind if needed
X-Git-Tag: upstream/7.37.1~4763
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=18a758d9078f506ecfb995ef5ece46a83887a5da;p=platform%2Fupstream%2Fcurl.git

chunky parser: only rewind if needed

The code reading chunked encoding attempts to rewind the code if it had
read more data than the chunky parser consumes. The rewinding can fail
and it will then cause an error. This change now makes the rewinding
only happen if pipelining is in use - as that's the only time it really
needs to be done.

Bug: http://curl.haxx.se/mail/lib-2010-08/0297.html
Reported by: Ron Parker
---

diff --git a/lib/transfer.c b/lib/transfer.c
index 71fb396..feaf936 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -594,9 +594,12 @@ static CURLcode readwrite_data(struct SessionHandle *data,
 
           dataleft = conn->chunk.dataleft;
           if(dataleft != 0) {
-            infof(conn->data, "Leftovers after chunking. "
-                  " Rewinding %zu bytes\n",dataleft);
-            read_rewind(conn, dataleft);
+            infof(conn->data, "Leftovers after chunking: %zu bytes", dataleft);
+            if(conn->data->multi && Curl_multi_canPipeline(conn->data->multi)) {
+              /* only attempt the rewind if we truly are pipelining */
+              infof(conn->data, "Rewinding %zu bytes\n",dataleft);
+              read_rewind(conn, dataleft);
+            }
           }
         }
         /* If it returned OK, we just keep going */