diff options
author | Daniel Stenberg <daniel@haxx.se> | 2006-02-07 23:09:04 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2006-02-07 23:09:04 +0000 |
commit | 12f5c67bf5d32baefd27757b8e6bc08683e7bef9 (patch) | |
tree | 61f7194b2ed155883b9917918f975e12293814fb /lib | |
parent | d7a83d8995c43371c48d2785e602c5f446b634ce (diff) |
Philippe Vaucher provided a brilliant piece of test code that show a problem
with re-used FTP connections. If the second request on the same connection was
set not to fetch a "body", libcurl could get confused and consider it an
attempt to use a dead connection and would go acting mighty strange.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/transfer.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/transfer.c b/lib/transfer.c index 18f8f1124..50a8bae98 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -2100,11 +2100,12 @@ bool Curl_retry_request(struct connectdata *conn, bool retry = FALSE; if((conn->keep.bytecount+conn->headerbytecount == 0) && - conn->bits.reuse) { - /* We got no data and 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 read from it again. Bad - luck. Retry the same request on a fresh connect! */ + conn->bits.reuse && + !conn->bits.no_body) { + /* We got no data, we attempted to re-use a connection and yet we want 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); |