Commit de7a1400 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

- 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.
parent e3ead9f5

CHANGES

+6 −0
Original line number Diff line number Diff line
@@ -6,6 +6,12 @@ 


                                  Changelog



Daniel Stenberg (19 May 2009)

- 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.



Version 7.19.5 (18 May 2009)



Daniel Stenberg (17 May 2009)

RELEASE-NOTES

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ This release includes the following changes: 


This release includes the following bugfixes:



 o 

 o crash on bad socket close with FTP



This release includes the following known bugs:
@@ -22,6 +22,6 @@ This release includes the following known bugs: 
This release would not have looked like this without help, code, reports and

advice from friends like these:



 

 Kamil Dudka, Caolan McNamara



        Thanks! (and sorry if I forgot to mention someone)

lib/ftp.c

+4 −3
Original line number Diff line number Diff line
@@ -3251,10 +3251,11 @@ 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 */

    }

    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 &&

     ftpc->pending_resp && !premature) {