diff options
| author | Logan Smyth <loganfsmyth@gmail.com> | 2011-09-04 11:38:34 -0400 |
|---|---|---|
| committer | koichik <koichik@improvement.jp> | 2011-09-05 00:48:35 +0900 |
| commit | bc0a552a846bae78040cc15827a6099b579a4401 (patch) | |
| tree | 9d5d43fcae22021315a113d1dd5a8562de2f5d34 /doc | |
| parent | 908ee33f2d7f0564d5e8160d2827fe9ec5ea109d (diff) | |
| download | nodejs-bc0a552a846bae78040cc15827a6099b579a4401.tar.gz nodejs-bc0a552a846bae78040cc15827a6099b579a4401.tar.bz2 nodejs-bc0a552a846bae78040cc15827a6099b579a4401.zip | |
docs: Fix merge error in tls docs
Fixes #1648.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/tls.markdown | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/api/tls.markdown b/doc/api/tls.markdown index 117d99694..c8aadeac0 100644 --- a/doc/api/tls.markdown +++ b/doc/api/tls.markdown @@ -70,7 +70,6 @@ thereafter. [Here is some code that does it.](http://gist.github.com/848444) -<<<<<<< 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 certificates. -======= + ### 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( ... ) |