RTSP followup fix. Both the pipelined and non-pipelined case need to

check for (excess > 0 && !k->ignorebody).

diff --git a/lib/transfer.c b/lib/transfer.c
index bf52044a0fec539f00e7d73c9749065e0699d402..ee80f47e6699d94fd45c3501e407d91005c9f965 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -619,28 +619,28 @@ static CURLcode readwrite_data(struct SessionHandle *data,
          (k->bytecount + nread >= k->maxdownload)) {
 
         excess = (size_t)(k->bytecount + nread - k->maxdownload);
-        if(conn->data->multi && Curl_multi_canPipeline(conn->data->multi)) {
-          /* The 'excess' amount below can't be more than BUFSIZE which
-             always will fit in a size_t */
-          if(excess > 0 && !k->ignorebody) {
+        if(excess > 0 && !k->ignorebody) {
+          if(conn->data->multi && Curl_multi_canPipeline(conn->data->multi)) {
+            /* The 'excess' amount below can't be more than BUFSIZE which
+               always will fit in a size_t */
             infof(data,
-                  "Rewinding stream by : %zu"
-                  " bytes on url %s (size = %" FORMAT_OFF_T
-                  ", maxdownload = %" FORMAT_OFF_T
-                  ", bytecount = %" FORMAT_OFF_T ", nread = %zd)\n",
-                  excess, data->state.path,
-                  k->size, k->maxdownload, k->bytecount, nread);
+                "Rewinding stream by : %zu"
+                " bytes on url %s (size = %" FORMAT_OFF_T
+                ", maxdownload = %" FORMAT_OFF_T
+                ", bytecount = %" FORMAT_OFF_T ", nread = %zd)\n",
+                excess, data->state.path,
+                k->size, k->maxdownload, k->bytecount, nread);
             read_rewind(conn, excess);
           }
-        }
-        else {
-          infof(data,
+          else {
+            infof(data,
                 "Excess found in a non pipelined read:"
                 " excess = %zu"
                 ", size = %" FORMAT_OFF_T
                 ", maxdownload = %" FORMAT_OFF_T
                 ", bytecount = %" FORMAT_OFF_T "\n",
                 excess, k->size, k->maxdownload, k->bytecount);
+          }
         }
 
         nread = (ssize_t) (k->maxdownload - k->bytecount);