Skip to content

Commit

Permalink
Support Node.js 10 (ldapjs#497)
Browse files Browse the repository at this point in the history
* Support node 10

* remove arrow function
  • Loading branch information
acappella2017 authored and Antero Halminen committed Feb 11, 2020
1 parent ad451ed commit 012afee
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions lib/client/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -1111,6 +1111,12 @@ Client.prototype.connect = function connect() {
socket.once('error', bail);
socket.once('end', bail);
socket.once('timeout', bail);
socket.once('cleanupSetupListeners', function onCleanup() {
socket.removeListener('error', bail)
.removeListener('close', bail)
.removeListener('end', bail)
.removeListener('timeout', bail);
});

self._socket = socket;
self._tracker = tracker;
Expand Down Expand Up @@ -1147,10 +1153,8 @@ Client.prototype.connect = function connect() {

// Wire up "official" event handlers after successful connect/setup
function postSetup() {
socket.removeAllListeners('error')
.removeAllListeners('close')
.removeAllListeners('end')
.removeAllListeners('timeout');
// cleanup the listeners we attached in setup phrase.
socket.emit('cleanupSetupListeners');

// Work around lack of close event on tls.socket in node < 0.11
((socket.socket) ? socket.socket : socket).once('close',
Expand Down

0 comments on commit 012afee

Please sign in to comment.