Commit 77268e06 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Joe Halpin made the FTP code send 'QUIT' on the control connection before 

it disconnects the TCP connection, like a good ftp client should!
parent 1ceb77b4

lib/ftp.c

+14 −9
Original line number Diff line number Diff line
@@ -2288,12 +2288,14 @@ CURLcode ftp_perform(struct connectdata *conn, 
 * parts etc as a wrapper to the actual DO function (ftp_perform).

 *

 * The input argument is already checked for validity.

 *

 * ftp->ctl_valid starts out as FALSE, and gets set to TRUE if we reach the

 * end of the function.

 */

CURLcode Curl_ftp(struct connectdata *conn)

{

  CURLcode retcode=CURLE_OK;

  bool connected=0;



  struct SessionHandle *data = conn->data;

  struct FTP *ftp;
@@ -2304,6 +2306,7 @@ CURLcode Curl_ftp(struct connectdata *conn) 


  /* the ftp struct is already inited in ftp_connect() */

  ftp = conn->proto.ftp;

  ftp->ctl_valid = FALSE;

  conn->size = -1; /* make sure this is unknown at this point */



  Curl_pgrsSetUploadCounter(data, 0);
@@ -2386,6 +2389,7 @@ CURLcode Curl_ftp(struct connectdata *conn) 
  else

    freedirs(ftp);



  ftp->ctl_valid = TRUE;

  return retcode;

}
@@ -2452,11 +2456,13 @@ CURLcode Curl_ftp_quit(struct connectdata *conn) 
{

  ssize_t nread;

  int ftpcode;

  CURLcode ret;

  CURLcode ret = CURLE_OK;



  if(conn->proto.ftp->ctl_valid) {

    ret = Curl_ftpsendf(conn, "%s", "QUIT");

    if(CURLE_OK == ret)

      ret = Curl_GetFTPResponse(&nread, conn, &ftpcode);

  }



  return ret;

}
@@ -2472,15 +2478,14 @@ CURLcode Curl_ftp_disconnect(struct connectdata *conn) 
{

  struct FTP *ftp= conn->proto.ftp;



#if 0

  /* We cannot send quit unconditionally. If this connection is stale or

     bad in any way, sending quit and waiting around here will make the

     disconnect wait in vain and cause more problems than we need to.



     Until fixed, we keep this #if 0'ed. To be fixed in 7.11.1. Stay tuned.

     Curl_ftp_quit() will check the state of ftp->ctl_valid. If it's ok it

     will try to send the QUIT command, otherwise it will just return.

  */

  (void)Curl_ftp_quit(conn); /* ignore errors on the QUIT */

#endif



  /* The FTP session may or may not have been allocated/setup at this point! */

  if(ftp) {

lib/urldata.h

+4 −0
Original line number Diff line number Diff line
@@ -258,6 +258,10 @@ struct FTP { 
  long response_time; /* When no timeout is given, this is the amount of

                         seconds we await for an FTP response. Initialized

                         in Curl_ftp_connect() */

  bool ctl_valid;     /* Tells Curl_ftp_quit() whether or not to do 

                         anything. If the connection has timed out or

                         been closed, this should be FALSE when it gets

                         to Curl_ftp_quit() */

};



/****************************************************************************

tests/data/test100

+1 −0
Original line number Diff line number Diff line
@@ -43,5 +43,6 @@ PWD 
EPSV

TYPE A

LIST

QUIT

</protocol>

</verify>

tests/data/test101

+1 −0
Original line number Diff line number Diff line
@@ -43,5 +43,6 @@ PWD 
PORT 127,0,0,1,243,212

TYPE A

LIST

QUIT

</protocol>

</verify>

tests/data/test102

+1 −0
Original line number Diff line number Diff line
@@ -38,5 +38,6 @@ PASV 
TYPE I

SIZE 102

RETR 102

QUIT

</protocol>

</verify>