aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2007-09-11 22:21:12 +0000
committerDaniel Stenberg <daniel@haxx.se>2007-09-11 22:21:12 +0000
commitcc618e761c4f009b11834383204b54bc1d0e1c5d (patch)
tree08ace6bf5466b0c295a40ff92c7d73b86e0dfb61
parent24db40de7c0689706792434d138801e9b1c6aaa4 (diff)
- 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.
-rw-r--r--lib/transfer.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/transfer.c b/lib/transfer.c
index 29eb61985..d16d29268 100644
--- 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 &&