Skip to content

Commit

Permalink
squash! address @lpinca's suggestion
Browse files Browse the repository at this point in the history
  • Loading branch information
aqrln committed May 24, 2017
1 parent 2dc7c14 commit f7db525
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
10 changes: 6 additions & 4 deletions doc/api/net.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,13 @@ by the OS through sysctl settings such as `tcp_max_syn_backlog` and `somaxconn`
on Linux. The default value of this parameter is 511 (not 512).


*Note*: All [`net.Socket`][] are set to `SO_REUSEADDR` (See [socket(7)][] for
details).
*Note*:

*Note*: The `server.listen()` method may be called multiple times. Each
subsequent call will *re-open* the server using the provided options.
* All [`net.Socket`][] are set to `SO_REUSEADDR` (See [socket(7)][] for
details).

* The `server.listen()` method may be called multiple times. Each
subsequent call will *re-open* the server using the provided options.

One of the most common errors raised when listening is `EADDRINUSE`.
This happens when another server is already listening on the requested
Expand Down
14 changes: 8 additions & 6 deletions doc/api/tls.md
Original file line number Diff line number Diff line change
Expand Up @@ -989,13 +989,15 @@ changes:
* `sessionIdContext` {string} Optional opaque identifier used by servers to
ensure session state is not shared between applications. Unused by clients.

*Note*: [`tls.createServer()`][] sets the default value of the
`honorCipherOrder` option to `true`, other APIs that create secure contexts
leave it unset.
*Note*:

*Note*: [`tls.createServer()`][] uses a 128 bit truncated SHA1 hash value
generated from `process.argv` as the default value of the `sessionIdContext`
option, other APIs that create secure contexts have no default value.
* [`tls.createServer()`][] sets the default value of the
`honorCipherOrder` option to `true`, other APIs that create secure contexts
leave it unset.

* [`tls.createServer()`][] uses a 128 bit truncated SHA1 hash value
generated from `process.argv` as the default value of the `sessionIdContext`
option, other APIs that create secure contexts have no default value.

The `tls.createSecureContext()` method creates a credentials object.

Expand Down

0 comments on commit f7db525

Please sign in to comment.