Commit 6ffe0f5d authored by Markus Westerlind's avatar Markus Westerlind Committed by Daniel Stenberg
Browse files

transfer: only retry nobody-requests for HTTP 

Using sftp to delete a file with CURLOPT_NOBODY set with a reused
connection would fail as curl expected to get some data. Thus it would
retry the command again which fails as the file has already been
deleted.

Fixes #1243
parent 3c5bfe48

lib/transfer.c

+11 −6
Original line number Original line Diff line number Diff line
@@ -1844,11 +1844,16 @@ CURLcode Curl_retry_request(struct connectdata *conn, 




  if((data->req.bytecount + data->req.headerbytecount == 0) &&

  if((data->req.bytecount + data->req.headerbytecount == 0) &&

      conn->bits.reuse &&

      conn->bits.reuse &&

      (!data->set.opt_no_body

        || (conn->handler->protocol & PROTO_FAMILY_HTTP)) &&

      (data->set.rtspreq != RTSPREQ_RECEIVE)) {

      (data->set.rtspreq != RTSPREQ_RECEIVE)) {

    /* We didn't get a single byte when we attempted to re-use a

    /* We got no data, we attempted to re-use a connection. For HTTP this

       connection. This might happen if the connection was left alive when we

       can be a retry so we try again regardless if we expected a body.

       were done using it before, but that was closed when we wanted to use it

       For other protocols we only try again only if we expected a body.

       again. Bad luck. Retry the same request on a fresh connect! */



       This might happen if the connection was left alive when we were

       done using it before, but that was closed when we wanted to read from

       it again. Bad luck. Retry the same request on a fresh connect! */

    infof(conn->data, "Connection died, retrying a fresh connect\n");

    infof(conn->data, "Connection died, retrying a fresh connect\n");

    *url = strdup(conn->data->change.url);

    *url = strdup(conn->data->change.url);

    if(!*url)

    if(!*url)