- Bug report #1792649 (http://curl.haxx.se/bug/view.cgi?id=1792649) pointed

  out a problem with doing an empty upload over FTP on a re-used connection.
  I added test case 541 to reproduce it and to verify the fix.

diff --git a/lib/transfer.c b/lib/transfer.c
index 29eb6198599b3863ad32a56f3e32723713da5ff2..d16d29268b0e28eb6d0b906adf24cae1ae8aa4bf 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -2368,6 +2368,11 @@ bool Curl_retry_request(struct connectdata *conn,
   bool retry = FALSE;
   struct SessionHandle *data = conn->data;
 
+  /* if we're talking upload, we can't do the checks below, unless the protocol
+     is HTTP as when uploading over HTTP we will still get a response */
+  if(data->set.upload && !(conn->protocol&PROT_HTTP))
+    return retry;
+
   if((data->reqdata.keep.bytecount +
       data->reqdata.keep.headerbytecount == 0) &&
      conn->bits.reuse &&