From fce02e1cab4e1010f1eaa905ac396f950f49aee6 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 29 Jan 2010 01:16:23 +0000 Subject: [PATCH] RTSP followup fix. Both the pipelined and non-pipelined case need to check for (excess > 0 && !k->ignorebody). --- lib/transfer.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/transfer.c b/lib/transfer.c index bf52044a0..ee80f47e6 100644 --- 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);