On 6/10/2014 5:34 PM, Daniel Stenberg wrote:
> On Mon, 9 Jun 2014, Ray Satiro wrote:
>
>> - res = Curl_done(&data->easy_conn, CURLE_OK, FALSE);
>> + res = Curl_done(&data->easy_conn, data->result, FALSE);
>
> Ah yes, that's indeed a suitable change. Thanks!
>
>> After that change the progress callback is not called a final time
>> after CURLE_ABORTED_BY_CALLBACK.
>
> For any error really, not only CURLE_ABORTED_BY_CALLBACK.
>
> But it relies on the protocol handler's done function to handle it. I
> would like to add a little extra precaution:
>
> --- a/lib/url.c
> +++ b/lib/url.c
> @@ -5806,11 +5806,11 @@ CURLcode Curl_done(struct connectdata **connp,
>
> /* this calls the protocol-specific function pointer previously set */
> if(conn->handler->done)
> result = conn->handler->done(conn, status, premature);
> else
> - result = CURLE_OK;
> + result = status;
>
> if(Curl_pgrsDone(conn) && !result)
> result = CURLE_ABORTED_BY_CALLBACK;
>
> /* if the transfer was completed in a paused state there can be
> buffered
>
> ... for the case where there is no done function for the protocol.
>

Ok but I notice your other change is missing now. The behavior doesn't
change unless your first change is applied as well:

url.c Curl_done() line 5808-5816
----------
    if(conn->handler->done)
      result = conn->handler->done(conn, status, premature);
    else
- result = CURLE_OK;
+ result = status;

- if(Curl_pgrsDone(conn) && !result)
+ if((status != CURLE_ABORTED_BY_CALLBACK) && Curl_pgrsDone(conn) &&
!result)
      result = CURLE_ABORTED_BY_CALLBACK;

    /* if the transfer was completed in a paused state there can be buffered
----------

-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette: http://curl.haxx.se/mail/etiquette.html
Received on 2014-06-11