diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2018-06-02 10:52:59 +0200 |
|---|---|---|
| committer | Anna Henningsen <anna@addaleax.net> | 2018-06-08 00:53:37 +0200 |
| commit | a76f0298184115971bac56dd369418786569f76d (patch) | |
| tree | a337f105fb3c0cd36e53098d4badbadab2bbde49 /lib/https.js | |
| parent | efdc1a44bb540375110720882f3f978cf20b1259 (diff) | |
| download | android-node-v8-a76f0298184115971bac56dd369418786569f76d.tar.gz android-node-v8-a76f0298184115971bac56dd369418786569f76d.tar.bz2 android-node-v8-a76f0298184115971bac56dd369418786569f76d.zip | |
lib,src: remove openssl feature conditionals
Remove compile-time and run-time conditionals for features that
OpenSSL 1.0.0 and 1.0.1 didn't support: ALPN, OCSP and/or SNI.
They are no longer necessary since our baseline is OpenSSL 1.0.2.
PR-URL: https://github.com/nodejs/node/pull/21094
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'lib/https.js')
| -rw-r--r-- | lib/https.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/https.js b/lib/https.js index 53a8a2751d..43bd6ee06c 100644 --- a/lib/https.js +++ b/lib/https.js @@ -48,7 +48,7 @@ function Server(opts, requestListener) { } opts = util._extend({}, opts); - if (process.features.tls_alpn && !opts.ALPNProtocols) { + if (!opts.ALPNProtocols) { // http/1.0 is not defined as Protocol IDs in IANA // http://www.iana.org/assignments/tls-extensiontype-values // /tls-extensiontype-values.xhtml#alpn-protocol-ids |