From de7a14003c0ef455e074cc9629bf9faae3474a7e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 19 May 2009 20:54:31 +0000 Subject: - Kamil Dudka brought the patch from the Redhat bug entry https://bugzilla.redhat.com/show_bug.cgi?id=427966 which was libcurl closing a bad file descriptor when closing down the FTP data connection. Caolan McNamara seems to be the original author of it. --- lib/ftp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/ftp.c b/lib/ftp.c index ebd04f954..0bd07710d 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -3251,9 +3251,10 @@ static CURLcode ftp_done(struct connectdata *conn, CURLcode status, /* Note that we keep "use" set to TRUE since that (next) connection is still requested to use SSL */ } - sclose(conn->sock[SECONDARYSOCKET]); - - conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD; + if(CURL_SOCKET_BAD != conn->sock[SECONDARYSOCKET]) { + sclose(conn->sock[SECONDARYSOCKET]); + conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD; + } } if((ftp->transfer == FTPTRANSFER_BODY) && ftpc->ctl_valid && -- cgit v1.2.3