fix incorrect merge for pull request #444

Conflicts:
	lib/connectors/hybrid/switcher.js

I don't know why pr #444 is lost, but so it is.

Change-Id: I7a154662a1e0a916f05a800f6a5d10eddc815b92

lib/connectors/hybrid/switcher.js

@@ -24,8 +24,7 @@ var Switcher = function(server, opts) {
   this.wsprocessor = new WSProcessor();
   this.tcpprocessor = new TCPProcessor(opts.closeMethod);
   this.id = 1;
-  this.timers = {};
-  this.timeout = opts.timeout || DEFAULT_TIMEOUT;
+  this.timeout = (timeout || DEFAULT_TIMEOUT) * 1000;
   this.setNoDelay = opts.setNoDelay;
 
   if (!opts.ssl) {
@@ -51,29 +50,14 @@ Switcher.prototype.newSocket = function(socket) {
     return;
   }
   // if set connection timeout
-  if(!!this.timeout) {
-    var timer = setTimeout(function() {
-      logger.warn('connection is timeout without communication, the remote ip is %s && port is %s', socket.remoteAddress, socket.remotePort);
-      socket.destroy();
-    }, this.timeout * 1000);
-
-    this.timers[this.id] = timer;
-    socket.id = this.id++;
-  }
+  socket.setTimeout(function() {
+     logger.warn('connection is timeout without communication, the remote ip is %s && port is %s', socket.remoteAddress, socket.remotePort);
+     socket.destroy();
+  }, this.timeout)
 
   var self = this;
-  socket.once('close', function() {
-    if (!!socket.id) {
-      clearTimeout(self.timers[socket.id]);
-      delete self.timers[socket.id];
-    }
-  });
 
   socket.once('data', function(data) {
-    if(!!socket.id) {
-      clearTimeout(self.timers[socket.id]);
-      delete self.timers[socket.id];
-    }
     // FIXME: handle incomplete HTTP method
     if(isHttp(data)) {
       processHttp(self, self.wsprocessor, socket, data);