Skip to content


Subversion checkout URL

You can clone with
Download ZIP


Fix merge error in tls docs #1648

wants to merge 1 commit into from

2 participants


Looks like there was a merge conflict in tls.markdown at some point.

@koichik koichik closed this in bc0a552


Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 4, 2011
  1. @loganfsmyth
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 3 deletions.
  1. +1 −3 doc/api/tls.markdown
4 doc/api/tls.markdown
@@ -70,7 +70,6 @@ thereafter.
[Here is some code that does it.](
-<<<<<<< HEAD
### NPN and SNI
NPN (Next Protocol Negotitation) and SNI (Server Name Indication) are TLS
@@ -79,14 +78,13 @@ handshake extensions allowing you:
* NPN - to use one TLS server for multiple protocols (HTTP, SPDY)
* SNI - to use one TLS server for multiple hostnames with different SSL
### pair = tls.createSecurePair([credentials], [isServer], [requestCert], [rejectUnauthorized])
Creates a new secure pair object with two streams, one of which reads/writes
encrypted data, and one reads/writes cleartext data.
Generally the encrypted one is piped to/from an incoming encrypted data stream,
and the cleartext one is used as a replacement for the initial encrypted stream.
->>>>>>> origin/v0.4
- `credentials`: A credentials object from crypto.createCredentials( ... )
Something went wrong with that request. Please try again.