diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2011-05-22 13:02:06 -0700 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2011-05-22 13:02:06 -0700 |
| commit | 860cb906a683bcbf297a02a1e7e821ff469fafe4 (patch) | |
| tree | 08b8100f3b6d760399654e7d14c1148e9ba83a30 /doc | |
| parent | 59274e8a337e8e0d84fd6c9973e32f0d20edba39 (diff) | |
| parent | 823604a4e0a6120ade470e98f8c0058d3fd0de05 (diff) | |
| download | android-node-v8-860cb906a683bcbf297a02a1e7e821ff469fafe4.tar.gz android-node-v8-860cb906a683bcbf297a02a1e7e821ff469fafe4.tar.bz2 android-node-v8-860cb906a683bcbf297a02a1e7e821ff469fafe4.zip | |
Merge branch 'v0.4'
Conflicts:
src/node_version.h
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/net.markdown | 7 | ||||
| -rw-r--r-- | doc/index.html | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/doc/api/net.markdown b/doc/api/net.markdown index b25e2e684f..638a593c8c 100644 --- a/doc/api/net.markdown +++ b/doc/api/net.markdown @@ -104,12 +104,13 @@ when the server has been bound. Start a server listening for connections on the given file descriptor. This file descriptor must have already had the `bind(2)` and `listen(2)` system -calls invoked on it. +calls invoked on it. Additionally, it must be set non-blocking; try +`fcntl(fd, F_SETFL, O_NONBLOCK)`. #### server.pause(msecs) -Stop accepting connections for the given number of milliseconds (default is -one second). This could be useful for throttling new connections against +Stop accepting connections for the given number of milliseconds (default is +one second). This could be useful for throttling new connections against DoS attacks or other oversubscription. #### server.close() diff --git a/doc/index.html b/doc/index.html index 758f02f8e5..c4dc5f16ac 100644 --- a/doc/index.html +++ b/doc/index.html @@ -26,7 +26,7 @@ <li><a href="#download">Download</a></li> <li><a href="https://github.com/joyent/node/raw/v0.4/ChangeLog">ChangeLog</a></li> <li><a href="#about">About</a></li> - <li><a href="http://nodejs.org/docs/v0.4.7/api">v0.4.7 docs</a></li> + <li><a href="http://nodejs.org/docs/v0.4.8/api">v0.4.8 docs</a></li> <br/> <li><a href="https://github.com/joyent/node/wiki">Wiki</a></li> <li><a href="http://blog.nodejs.org/">Blog</a></li> @@ -108,9 +108,9 @@ server.listen(1337, "127.0.0.1"); </p> <p> - 2011.04.22 - <a href="http://nodejs.org/dist/node-v0.4.7.tar.gz">node-v0.4.7.tar.gz</a> - (<a href="http://nodejs.org/docs/v0.4.7/api/index.html">Documentation</a>) + 2011.05.20 + <a href="http://nodejs.org/dist/node-v0.4.8.tar.gz">node-v0.4.8.tar.gz</a> + (<a href="http://nodejs.org/docs/v0.4.8/api/index.html">Documentation</a>) </p> <p>Historical: <a href="http://nodejs.org/dist">versions</a>, <a href="http://nodejs.org/docs">docs</a></p> |