diff options
| author | isaacs <i@izs.me> | 2012-12-13 16:57:58 -0800 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-12-13 16:57:58 -0800 |
| commit | 77ed12fe7a16d3d97d637512db109f4273711bec (patch) | |
| tree | d4b7237231ab810e8dc5906204e5d861efce2773 /lib/tls.js | |
| parent | 6cf68aead6886d397772ea176a9f5c35fdb63071 (diff) | |
| parent | 45cdb0e4c12d8f8e9450174ddd6ddad52a995831 (diff) | |
| download | nodejs-77ed12fe7a16d3d97d637512db109f4273711bec.tar.gz nodejs-77ed12fe7a16d3d97d637512db109f4273711bec.tar.bz2 nodejs-77ed12fe7a16d3d97d637512db109f4273711bec.zip | |
Merge remote-tracking branch 'ry/v0.8' into master
Conflicts:
AUTHORS
ChangeLog
deps/uv/test/test-spawn.c
deps/uv/uv.gyp
src/cares_wrap.cc
src/node.cc
src/node_version.h
test/simple/test-buffer.js
tools/gyp/pylib/gyp/common.py
tools/install.py
Diffstat (limited to 'lib/tls.js')
| -rw-r--r-- | lib/tls.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tls.js b/lib/tls.js index dc76ab63b..36109469f 100644 --- a/lib/tls.js +++ b/lib/tls.js @@ -1320,7 +1320,7 @@ exports.connect = function(/* [port, host], options, cb */) { var cleartext = pipe(pair, socket); if (cb) { - cleartext.on('secureConnect', cb); + cleartext.once('secureConnect', cb); } if (!options.socket) { |