Merge remote-tracking branch 'upstream/v0.10'
Conflicts: AUTHORS ChangeLog deps/uv/AUTHORS deps/uv/ChangeLog deps/uv/build.mk deps/uv/src/unix/linux-core.c deps/uv/src/unix/stream.c deps/uv/src/unix/sunos.c deps/uv/src/version.c src/node_version.h
This commit is contained in:
Коммит
845e5d3458
7
AUTHORS
7
AUTHORS
|
@ -514,7 +514,6 @@ Benjamin Waters <benjamin.waters@outlook.com>
|
|||
Lev Gimelfarb <lev.gimelfarb@gmail.com>
|
||||
Peter Flannery <flannery.peter@ntlworld.com>
|
||||
Tuğrul Topuz <tugrultopuz@gmail.com>
|
||||
ayanamist <contact@ayanamist.com>
|
||||
Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
|
||||
Brandon Cheng <bcheng.gt@gmail.com>
|
||||
Alexis Campailla <alexis@janeasystems.com>
|
||||
|
@ -524,3 +523,9 @@ Jo Liss <joliss42@gmail.com>
|
|||
Jun Ma <roammm@gmail.com>
|
||||
Jacob Hoffman-Andrews <github@hoffman-andrews.com>
|
||||
Keith M Wesolowski <wesolows@joyent.com>
|
||||
Maxime Quandalle <maxime.quandalle@gmail.com>
|
||||
Doron Pagot <doronpagot@gmail.com>
|
||||
Kenan Sulayman <kenan@sly.mn>
|
||||
Christian Schulz <me@rndm.de>
|
||||
Pedro Ballesteros <nitroduna@gmail.com>
|
||||
Anton Khlynovskiy <subzey@gmail.com>
|
||||
|
|
29
ChangeLog
29
ChangeLog
|
@ -498,6 +498,35 @@
|
|||
* console: `console.dir()` bypasses inspect() methods (Nathan Rajlich)
|
||||
|
||||
|
||||
2014.02.18, Version 0.10.26 (Stable), cc56c62ed879ad4f93b1fdab3235c43e60f48b7e
|
||||
|
||||
* uv: Upgrade to v0.10.25 (Timothy J Fontaine)
|
||||
|
||||
* npm: upgrade to 1.4.3 (isaacs)
|
||||
|
||||
* v8: support compiling with VS2013 (Fedor Indutny)
|
||||
|
||||
* cares: backport TXT parsing fix (Fedor Indutny)
|
||||
|
||||
* crypto: throw on SignFinal failure (Fedor Indutny)
|
||||
|
||||
* crypto: update root certificates (Ben Noordhuis)
|
||||
|
||||
* debugger: Fix breakpoint not showing after restart (Farid Neshat)
|
||||
|
||||
* fs: make unwatchFile() insensitive to path (iamdoron)
|
||||
|
||||
* net: do not re-emit stream errors (Fedor Indutny)
|
||||
|
||||
* net: make Socket destroy() re-entrance safe (Jun Ma)
|
||||
|
||||
* net: reset `endEmitted` on reconnect (Fedor Indutny)
|
||||
|
||||
* node: do not close stdio implicitly (Fedor Indutny)
|
||||
|
||||
* zlib: avoid assertion in close (Fedor Indutny)
|
||||
|
||||
|
||||
2014.01.23, Version 0.10.25 (Stable), b0e5f195dfce3e2b99f5091373d49f6616682596
|
||||
|
||||
* uv: Upgrade to v0.10.23
|
||||
|
|
|
@ -169,9 +169,13 @@ Example: the definition of `console.log`
|
|||
};
|
||||
|
||||
`process.stderr` and `process.stdout` are unlike other streams in Node in
|
||||
that writes to them are usually blocking. They are blocking in the case
|
||||
that they refer to regular files or TTY file descriptors. In the case they
|
||||
refer to pipes, they are non-blocking like other streams.
|
||||
that writes to them are usually blocking.
|
||||
|
||||
- They are blocking in the case that they refer to regular files or TTY file
|
||||
descriptors.
|
||||
- In the case they refer to pipes:
|
||||
- They are blocking in Linux/Unix.
|
||||
- They are non-blocking like other streams in Windows.
|
||||
|
||||
To check if Node is being run in a TTY context, read the `isTTY` property
|
||||
on `process.stderr`, `process.stdout`, or `process.stdin`:
|
||||
|
@ -193,29 +197,45 @@ See [the tty docs](tty.html#tty_tty) for more information.
|
|||
A writable stream to stderr.
|
||||
|
||||
`process.stderr` and `process.stdout` are unlike other streams in Node in
|
||||
that writes to them are usually blocking. They are blocking in the case
|
||||
that they refer to regular files or TTY file descriptors. In the case they
|
||||
refer to pipes, they are non-blocking like other streams.
|
||||
that writes to them are usually blocking.
|
||||
|
||||
- They are blocking in the case that they refer to regular files or TTY file
|
||||
descriptors.
|
||||
- In the case they refer to pipes:
|
||||
- They are blocking in Linux/Unix.
|
||||
- They are non-blocking like other streams in Windows.
|
||||
|
||||
|
||||
## process.stdin
|
||||
|
||||
A `Readable Stream` for stdin. The stdin stream is paused by default, so one
|
||||
must call `process.stdin.resume()` to read from it.
|
||||
A `Readable Stream` for stdin.
|
||||
|
||||
Example of opening standard input and listening for both events:
|
||||
|
||||
process.stdin.resume();
|
||||
process.stdin.setEncoding('utf8');
|
||||
|
||||
process.stdin.on('data', function(chunk) {
|
||||
process.stdout.write('data: ' + chunk);
|
||||
process.stdin.on('readable', function(chunk) {
|
||||
var chunk = process.stdin.read();
|
||||
if (chunk !== null) {
|
||||
process.stdout.write('data: ' + chunk);
|
||||
}
|
||||
});
|
||||
|
||||
process.stdin.on('end', function() {
|
||||
process.stdout.write('end');
|
||||
});
|
||||
|
||||
As a Stream, `process.stdin` can also be used in "old" mode that is compatible
|
||||
with scripts written for node prior v0.10.
|
||||
For more information see
|
||||
[Stream compatibility](stream.html#stream_compatibility_with_older_node_versions).
|
||||
|
||||
In "old" Streams mode the stdin stream is paused by default, so one
|
||||
must call `process.stdin.resume()` to read from it. Note also that calling
|
||||
`process.stdin.resume()` itself would switch stream to "old" mode.
|
||||
|
||||
If you are starting a new project you should prefer a more recent "new" Streams
|
||||
mode over "old" one.
|
||||
|
||||
## process.argv
|
||||
|
||||
|
|
|
@ -999,6 +999,9 @@ how to implement Writable streams in your programs.
|
|||
returning false. Default=16kb, or 16 for `objectMode` streams
|
||||
* `decodeStrings` {Boolean} Whether or not to decode strings into
|
||||
Buffers before passing them to [`_write()`][]. Default=true
|
||||
* `objectMode` {Boolean} Whether or not the `write(anyObj)` is
|
||||
a valid operation. If set you can write arbitrary data instead
|
||||
of only `Buffer` / `String` data. Default=false
|
||||
|
||||
In classes that extend the Writable class, make sure to call the
|
||||
constructor so that the buffering settings can be properly
|
||||
|
|
Двоичный файл не отображается.
После Ширина: | Высота: | Размер: 4.3 KiB |
Двоичный файл не отображается.
После Ширина: | Высота: | Размер: 23 KiB |
Двоичный файл не отображается.
После Ширина: | Высота: | Размер: 3.2 KiB |
|
@ -4,6 +4,12 @@
|
|||
|
||||
set -e
|
||||
|
||||
if [[ ! -e ../node-website/Makefile ]];
|
||||
then
|
||||
echo "node-website must be checked out one level up"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
stability="$(python tools/getstability.py)"
|
||||
NODE_STABC="$(tr '[:lower:]' '[:upper:]' <<< ${stability:0:1})${stability:1}"
|
||||
NODE_STABL="$stability"
|
||||
|
@ -43,15 +49,16 @@ make email.md
|
|||
echo "title: Node v"$(python tools/getnodeversion.py)" ($NODE_STABC)"
|
||||
echo "slug: node-v"$(python tools/getnodeversion.py | sed 's|\.|-|g')"-$NODE_STABL"
|
||||
echo ""
|
||||
cat email.md ) > doc/blog/release/v$(python tools/getnodeversion.py).md
|
||||
cat email.md ) > ../node-website/doc/blog/release/v$(python tools/getnodeversion.py).md
|
||||
|
||||
if [ "$stability" = "stable" ];
|
||||
then
|
||||
## this needs to happen here because the website depends on the current node
|
||||
## node version
|
||||
## this will get the api docs in the right place
|
||||
make website-upload
|
||||
make blog-upload
|
||||
BRANCH="v$(python tools/getnodeversion.py | sed -E 's#\.[0-9]+$##')"
|
||||
echo $(python tools/getnodeversion.py) > ../node-website/STABLE
|
||||
else
|
||||
BRANCH="master"
|
||||
fi
|
||||
|
@ -67,13 +74,6 @@ git merge --no-ff v$(python tools/getnodeversion.py)-release
|
|||
vim src/node_version.h
|
||||
git commit -am "Now working on "$(python tools/getnodeversion.py)
|
||||
|
||||
if [ "$stability" = "stable" ];
|
||||
then
|
||||
echo "Adding blog"
|
||||
git add doc/blog
|
||||
git commit -m "blog: Post for v$(python tools/getprevnodeversion.py)"
|
||||
else
|
||||
echo "copy blog to stable branch"
|
||||
fi
|
||||
|
||||
git push git@github.com:joyent/node $BRANCH
|
||||
|
||||
echo "Now go do the website stuff"
|
||||
|
|
Загрузка…
Ссылка в новой задаче