Merge pull request socketio#297 from lpinca/close/data-request

polling: correctly abort the ongoing data request when closing transport

lib/transports/polling.js

@@ -176,7 +176,6 @@ Polling.prototype.onDataRequest = function (req, res) {
     cleanup();
   }
 
-  req.abort = cleanup;
   req.on('close', onClose);
   req.on('data', onData);
   req.on('end', onEnd);
@@ -265,9 +264,8 @@ Polling.prototype.doClose = function (fn) {
   debug('closing');
 
   if (this.dataReq) {
-    // FIXME: should we do this?
     debug('aborting ongoing data request');
-    this.dataReq.abort();
+    this.dataReq.destroy();
   }
 
   if (this.writable) {

test/server.js

@@ -733,6 +733,27 @@ describe('server', function () {
       });
     });
 
+    it('should abort the polling data request if it is ' +
+       'in progress', function (done) {
+      var engine = listen({ transports: [ 'polling' ] }, function (port) {
+        var socket = new eioc.Socket('http://localhost:%d'.s(port));
+
+        engine.on('connection', function (conn) {
+          var onDataRequest = conn.transport.onDataRequest;
+          conn.transport.onDataRequest = function (req, res) {
+            engine.httpServer.close(done);
+            onDataRequest.call(conn.transport, req, res);
+            req.removeAllListeners();
+            conn.close();
+          };
+        });
+
+        socket.on('open', function () {
+          socket.send('test');
+        });
+      });
+    });
+
     // tests https://github.com/LearnBoost/engine.io-client/issues/207
     // websocket test, transport error
     it('should trigger transport close before open for ws', function(done){