Merge branch 'master' of https://github.com/alanszlosek/nodeftpd

Author: joeytwiddle

ftpd.js

@@ -136,14 +136,6 @@ function createServer(host, sandbox, pasvstartport, numports) {
             }
         };
 
-        socket.addListener("connect", function () {
-            logIf(1, "Connection", socket);
-            //socket.send("220 NodeFTPd Server version 0.0.10\r\n");
-            //socket.write("220 written by Andrew Johnston (apjohnsto@gmail.com)\r\n");
-            //socket.write("220 Please visit http://github.com/billywhizz/NodeFTPd\r\n");
-            socket.write("220 FTP server (nodeftpd) ready\r\n");
-        });
-        
         socket.addListener("data", function (data) {
             data = (data+'').trim();
             logIf(2, "FTP command: " + data, socket);
@@ -366,18 +358,6 @@ function createServer(host, sandbox, pasvstartport, numports) {
                             // should watch out for malicious users uploading large amounts of data outside protocol
                             logIf(4, 'Data event: received ' + (Buffer.isBuffer(data) ? 'buffer' : 'string'), socket);
                         });
-                        psocket.on("connect", function() {
-                            logIf(1, "Passive data event: connect", socket);
-                            // Once we have a completed data connection, make note of it
-                            socket.dataSocket = psocket;
-
-                            // 150 should be sent before we send data on the data connection
-                            //socket.write("150 Connection Accepted\r\n");
-                            if (socket.readable) socket.resume();
-
-                            // Emit this so the pending callback gets picked up in whenDataWritable()
-                            socket.dataListener.emit("data-ready", psocket);
-                        });
                         psocket.on("end", function () {
                             logIf(3, "Passive data event: end", socket);
                             // remove pointer
@@ -397,6 +377,17 @@ function createServer(host, sandbox, pasvstartport, numports) {
                             );
                             if (socket.readable) socket.resume();
                         });
+
+                        // Once we have a completed data connection, make note of it
+                        socket.dataSocket = psocket;
+
+                        // 150 should be sent before we send data on the data connection
+                        //socket.write("150 Connection Accepted\r\n");
+                        if (socket.readable) socket.resume();
+
+                        // Emit this so the pending callback gets picked up in whenDataWritable()
+                        socket.dataListener.emit("data-ready", psocket);
+
                     });
                     // Once we're successfully listening, tell the client
                     pasv.addListener("listening", function() {
@@ -686,6 +677,13 @@ function createServer(host, sandbox, pasvstartport, numports) {
         socket.addListener("error", function (err) {
             logIf(0, "Client connection error: " + err, socket);
         });
+
+        // Tell client we're ready
+        logIf(1, "Connection", socket);
+        //socket.send("220 NodeFTPd Server version 0.0.10\r\n");
+        //socket.write("220 written by Andrew Johnston (apjohnsto@gmail.com)\r\n");
+        //socket.write("220 Please visit http://github.com/billywhizz/NodeFTPd\r\n");
+        socket.write("220 FTP server (nodeftpd) ready\r\n");
     });
 
     server.addListener("close", function() {