commit 82b0aebef36953604aa41b13669d48b2dc8983b8
author Gokhan Sengun <gokhansengun@gmail.com> Mon Jun 25 02:06:50 2012 +0300
committer Daniel Stenberg <daniel@haxx.se> Thu Aug 16 23:20:12 2012 +0200
tree c169344143bd1475026401c7ba2c32a73f60369c
parent 23ef5e4ba22386ccc43f99db1d0f4106dc603e80

ftp: active conn, place calling sockopt callback at the end of function

Commit b91d29a28e170c16d65d956db79f2cd3a82372d2 introduces a bug and breaks Curl_closesocket function. sock_accepted flag for the second socket should be tagged as TRUE before the sockopt callback is called because in case the callback returns an error, Curl_closesocket function is going to call the - fclosesocket - callback for the accept()ed socket

lib/ftp.c

diff --git a/lib/ftp.c b/lib/ftp.c
index 923fc3d..02c671a 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -348,6 +348,10 @@
   }
   infof(data, "Connection accepted from server\n");
 
+  conn->sock[SECONDARYSOCKET] = s;
+  curlx_nonblock(s, TRUE); /* enable non-blocking */
+  conn->sock_accepted[SECONDARYSOCKET] = TRUE;
+
   if(data->set.fsockopt) {
     int error = 0;
 
@@ -358,13 +362,11 @@
 
     if(error) {
       Curl_closesocket(conn, s); /* close the socket and bail out */
+      conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD;
       return CURLE_ABORTED_BY_CALLBACK;
     }
   }
 
-  conn->sock[SECONDARYSOCKET] = s;
-  curlx_nonblock(s, TRUE); /* enable non-blocking */
-  conn->sock_accepted[SECONDARYSOCKET] = TRUE;
   return CURLE_OK;
 
 }