[GNUnet-SVN] [gnurl] 115/173: transfer: only retry nobody-requests for HTTP

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to annotated tag gnurl-7.53.1
in repository gnurl.

commit 6ffe0f5d9670367f128d75c4c68bc427fdc60a5d
Author: Markus Westerlind <address@hidden>
AuthorDate: Fri Feb 3 15:58:41 2017 +0100

    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
---
 lib/transfer.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/transfer.c b/lib/transfer.c
index 750fb04e2..a577bf724 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -1843,12 +1843,17 @@ CURLcode Curl_retry_request(struct connectdata *conn,
     return CURLE_OK;
 
   if((data->req.bytecount + data->req.headerbytecount == 0) &&
-     conn->bits.reuse &&
-     (data->set.rtspreq != RTSPREQ_RECEIVE)) {
-    /* We didn't get a single byte when we attempted to re-use a
-       connection. This might happen if the connection was left alive when we
-       were done using it before, but that was closed when we wanted to use it
-       again. Bad luck. Retry the same request on a fresh connect! */
+      conn->bits.reuse &&
+      (!data->set.opt_no_body
+        || (conn->handler->protocol & PROTO_FAMILY_HTTP)) &&
+      (data->set.rtspreq != RTSPREQ_RECEIVE)) {
+    /* We got no data, we attempted to re-use a connection. For HTTP this
+       can be a retry so we try again regardless if we expected a body.
+       For other protocols we only try again only if we expected a body.
+
+       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");
     *url = strdup(conn->data->change.url);
     if(!*url)

-- 
To stop receiving notification emails like this one, please contact
address@hidden