Skip to content
Browse files

Merge remote branch 'origin/v0.4'

Conflicts:
	AUTHORS
	ChangeLog
	doc/api/stdio.markdown
	doc/index.html
	doc/template.html
	lib/net.js
	src/node_version.h
	test/simple/test-child-process-customfd-bounded.js
	test/simple/test-console-not-call-toString.js
  • Loading branch information...
2 parents 028908a + 0c91a83 commit f1996ffebc79148b94dab4cb6e7eceecf6e17554 @ry ry committed
Showing with 60 additions and 8 deletions.
  1. +5 −0 AUTHORS
  2. +26 −0 ChangeLog
  3. +24 −3 doc/api/stdio.markdown
  4. +4 −4 doc/index.html
  5. +1 −1 test/simple/test-child-process-customfd-bounded.js
View
5 AUTHORS
@@ -197,3 +197,8 @@ Igor Zinkovsky <igorzi@microsoft.com>
Shigeki Ohtsu <ohtsu@d.jp>
vegorov@chromium.org <vegorov@chromium.org>
Pierre-Alexandre St-Jean <pierrealexandre.stjean@gmail.com>
+Vicente Jimenez Aguilar <googuy@gmail.com>
+SAWADA Tadashi <cesare@mayverse.jp>
+Logan Smyth <loganfsmyth@gmail.com>
+Christopher Wright <christopherwright@gmail.com>
+Mickaël Delahaye <mickael.delahaye@gmail.com>
View
26 ChangeLog
@@ -166,6 +166,32 @@
* DTrace probes: support X-Forwarded-For (Dave Pacheco)
+2011.08.17, Version 0.4.11 (stable)
+
+* #738 Fix crypto encryption/decryption with Base64. (SAWADA Tadashi)
+
+* #1202 net.createConnection defer DNS lookup error events to next tick
+ (Ben Noordhuis)
+
+* #1374 fix setting ServerResponse.statusCode in writeHead (Trent Mick)
+
+* #1417 Fix http.ClientRequest crashes if end() was called twice
+
+* #1497 querystring: Replace 'in' test with 'hasOwnProperty' (isaacs)
+
+* #1546 http perf improvement
+
+* fix memleak in libeio (Tom Hughes)
+
+* cmake improvements (Tom Hughes)
+
+* node_net.cc: fix incorrect sizeof() (Tom Hughes)
+
+* Windows/cygwin: no more GetConsoleTitleW errors on XP (Bert Belder)
+
+* Doc improvments (koichik, Logan Smyth, Ben Noordhuis, Arnout Kazemier)
+
+
2011.07.19, Version 0.4.10 (stable)
* #394 Fix Buffer drops last null character in UTF-8
View
27 doc/api/stdio.markdown
@@ -9,9 +9,30 @@ Prints to stdout with newline. This function can take multiple arguments in a
console.log('count: %d', count);
-If formating elements are not found in the first string then `util.inspect`
-is used on each argument.
-See [util.format()](util.html#util.format) for more infomation.
+The first argument is a string that contains zero or more *placeholders*.
+Each placeholder is replaced with the converted value from its corresponding
+argument. Supported placeholders are:
+
+* `%s` - String.
+* `%d` - Number (both integer and float).
+* `%j` - JSON.
+
+If the placeholder does not have a corresponding argument, `undefined` is used.
+
+ console.log('%s:%s', 'foo'); // 'foo:undefined'
+
+If there are more arguments than placeholders, the extra arguments are
+converted to strings with `util.inspect()` and these strings are concatenated,
+delimited by a space.
+
+ console.log('%s:%s', 'foo', 'bar', 'baz'); // 'foo:bar baz'
+
+If the first argument is not a format string then `console.log()` prints
+a string that is the concatenation of all its arguments separated by spaces.
+Each argument is converted to a string with `util.inspect()`.
+
+ console.log(1, 2, 3); // '1 2 3'
+
### console.info()
View
8 doc/index.html
@@ -26,7 +26,7 @@
<li><a href="#download">Download</a></li>
<li><a href="https://github.com/joyent/node/wiki/ChangeLog">ChangeLog</a></li>
<li><a href="#about">About</a></li>
- <li><a href="http://nodejs.org/docs/v0.4.10/api">v0.4.10 docs</a></li>
+ <li><a href="http://nodejs.org/docs/v0.4.11/api">v0.4.11 docs</a></li>
<li><a href="http://nodejs.org/docs/v0.5.4/api">v0.5.4 docs</a></li>
<br/>
<li><a href="https://github.com/joyent/node/wiki">Wiki</a></li>
@@ -110,10 +110,10 @@ <h2 id="download">Download</h2>
<a href="http://github.com/joyent/node/tree/master">git repo</a>
</p>
- <p>2011.07.19 v0.4.10 (stable)
+ <p>2011.08.17 v0.4.11 (stable)
<ul class="release">
- <li><a href="http://nodejs.org/dist/node-v0.4.10.tar.gz"><code>node-v0.4.10.tar.gz</code> Source Code</a>
- <li><a href="http://nodejs.org/docs/v0.4.10/api/index.html">Documentation</a>
+ <li><a href="http://nodejs.org/dist/node-v0.4.11.tar.gz"><code>node-v0.4.11.tar.gz</code> Source Code</a>
+ <li><a href="http://nodejs.org/docs/v0.4.11/api/index.html">Documentation</a>
</ul>
<p>2011.08.12 v0.5.4 (unstable)
View
2 test/simple/test-child-process-customfd-bounded.js
@@ -1,8 +1,8 @@
var common = require('../common');
+
var bigish = Array(200);
for (var i = 0, il = bigish.length; i < il; ++i)
bigish[i] = -1;
common.spawnPwd({ customFds: bigish });
-

0 comments on commit f1996ff

Please sign in to comment.
Something went wrong with that request. Please try again.