verdnatura-mirror
/
node-ldapjs
mirror of https://github.com/ldapjs/node-ldapjs.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #68 from trentm/fix-client-connect 

Fix client 'connect' event being send when using tls.
This commit is contained in:
Mark Cavage 2012-04-16 09:58:28 -07:00
parent 34b9d7f8fd e825615d9e
commit 7d9b6debde
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/client.js
View File

@ -627,7 +627,22 @@ Client.prototype.connect = function connect(callback) {
var self = this; var self = this;
var timer = false; var timer = false;
c = proto.connect(opts.port, opts.host); c = proto.connect(opts.port, opts.host, function () {
if (timer)
clearTimeout(timer);
assert.ok(c.ldap);
c.ldap.id += c.fd ? (':' + c.fd) : '';
if (log.trace())
log.trace('%s connect event', c.ldap.id);
self.connection = c;
self.emit('connect', c);
return (typeof (callback) === 'function' ? callback(null, c) : false);
});
if (this.connectTimeout) { if (this.connectTimeout) {
timer = setTimeout(function () { timer = setTimeout(function () {
@ -658,22 +673,6 @@ Client.prototype.connect = function connect(callback) {
}) })
}; };
c.on('connect', function () {
if (timer)
clearTimeout(timer);
assert.ok(c.ldap);
c.ldap.id += c.fd ? (':' + c.fd) : '';
if (log.trace())
log.trace('%s connect event', c.ldap.id);
self.connection = c;
self.emit('connect', c);
return (typeof (callback) === 'function' ? callback(null, c) : false);
});
c.on('end', function () { c.on('end', function () {
if (log.trace()) if (log.trace())