diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2014-11-22 19:34:31 +0300 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2014-11-22 19:55:59 +0300 |
| commit | fcbbc7a050e9f03a8a8384b58774f6c151c0cbce (patch) | |
| tree | 9fbaed794a40e7318c28cb3306f4a73a3b6a69f5 /lib/tls.js | |
| parent | 21130c7d6fcaee666f33735768c060be2e06614a (diff) | |
| parent | 2d17193f20930bfe594d7008fe5c08f813f03c7b (diff) | |
Merge remote-tracking branch 'joyent/v0.12' into v0.12
Conflicts:
Makefile
deps/v8/src/base/platform/platform.h
PR-URL: https://github.com/node-forward/node/pull/65
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'lib/tls.js')
| -rw-r--r-- | lib/tls.js | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/tls.js b/lib/tls.js index 4ba8af50641..8e8f12a27e9 100644 --- a/lib/tls.js +++ b/lib/tls.js @@ -248,8 +248,4 @@ exports.TLSSocket = require('_tls_wrap').TLSSocket; exports.Server = require('_tls_wrap').Server; exports.createServer = require('_tls_wrap').createServer; exports.connect = require('_tls_wrap').connect; - -// Legacy API -exports.__defineGetter__('createSecurePair', util.deprecate(function() { - return require('_tls_legacy').createSecurePair; -}, 'createSecurePair() is deprecated, use TLSSocket instead')); +exports.createSecurePair = require('_tls_legacy').createSecurePair; |