daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,843 Commits
52 Branches
862 Tags
1.9 GiB
Commit Graph

1820 Commits (c20b209dbb7e2f3ac8a75a8750bc4205d43952c8)

Author SHA1 Message Date
Fedor Indutny de7c0e8c02 Merge branch 'v0.10' 
Conflicts:
	deps/openssl/asm/x64-elf-gas/aes/vpaes-x86_64.s
	deps/openssl/asm/x64-macosx-gas/aes/vpaes-x86_64.s
	deps/openssl/asm/x64-win32-masm/aes/vpaes-x86_64.asm
	deps/openssl/openssl/CHANGES
	deps/openssl/openssl/Makefile
	deps/openssl/openssl/Makefile.org
	deps/openssl/openssl/NEWS
	deps/openssl/openssl/README
	deps/openssl/openssl/crypto/opensslv.h
	deps/openssl/openssl/openssl.spec
	deps/openssl/openssl/ssl/s23_clnt.c
	lib/http.js
	test/simple/test-http-client-readable.js
 2014-04-08 08:55:57 +04:00
Brian White c2d32f4c0e doc: add missing space 
Signed-off-by: Fedor Indutny <fedor@indutny.com>
 2014-04-07 17:45:04 +04:00
Evan Carroll 95dbb6bf64 util: made util.isArray a direct alias for Array.isArray 2014-04-03 22:39:42 +04:00
Dominic Tarr cdc093b31f docs: correct tls docs. server -> client 
when a pfx file is passed to tls.connection,
it is the client private key, not the server's private key.
 2014-04-02 15:34:16 +04:00
C. Scott Ananian 08a5b442e4 node: add signature to SET_PROTOTYPE_METHOD 
This prevents segfaults when a native method is reassigned to a
different object (which corrupts args.This()).  When unwrapping,
clients should use args.Holder() instead of args.This().

Closes #6690.

Signed-off-by: Trevor Norris <trev.norris@gmail.com>
 2014-04-02 01:48:34 -07:00
Goh Yisheng (Andrew) 47bed4828c doc: typo clean up in tls 2014-03-31 07:40:17 -07:00
Fedor Indutny 5d2aef17ee
crypto: move `createCredentials` to tls 
Move `createCredentials` to `tls` module and rename it to
`createSecureContext`. Make it use default values from `tls` module:
`DEFAULT_CIPHERS` and `DEFAULT_ECDH_CURVE`.

fix #7249
 2014-03-29 12:01:43 +04:00
Nathan Rajlich 69b8279d4b doc: remove `agent.request()` call in example 
The `Agent#request()` function was removed in
f3189ace6b, so don't
use it in the documentation example. The function
wasn't documented in the first place.
 2014-03-25 10:02:42 -10:00
Ben Noordhuis 1f17f88071 src, test: fix up ObjectWrap, `make test-addons` 
V8 was upgraded from 3.22 to 3.24 in commit 1c7bf24.  Upgrade source
files in test/addons/ and automatically generated tests from
doc/api/addons.markdown to the new V8 API.

This coincidentally fixes a bug in src/node_object_wrap.h where it was
still using the old V8 weak persistent handle interface, which is gone
in 3.24.
 2014-03-14 00:41:04 +04:00
Timothy J Fontaine b444392a98 Merge remote-tracking branch 'upstream/v0.10' 
Conflicts:
	src/node.cc
	src/node.js
	test/message/max_tick_depth_trace.out
 2014-03-10 16:50:00 -07:00
Shuhei Kagawa 43a29f53ca doc: remove an unused arg in process.stdin. 
The argument of process.stdin's readable event handler is not used.
 2014-03-10 15:30:40 -07:00
Brian White 31ce34887f crypto: allow setting add'l authenticated data 2014-03-04 12:42:03 +04:00
Fedor Indutny 78d245f5b2 Merge remote-tracking branch 'origin/v0.10' 
Conflicts:
	configure
	lib/_stream_readable.js
	lib/http.js
	src/node_dtrace.cc
 2014-03-02 23:54:19 +04:00
Sam Roberts 37d3c56c0b doc: document `beforeExit` and add more tests 2014-02-28 15:36:22 +04:00
Nicolas Talle 1efe6837b2 doc: update assert.markdown 
Update assert.throws() and assert.doesNotThrow() docs
 2014-02-23 18:09:26 +04:00
Timothy J Fontaine 845e5d3458 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
 2014-02-19 09:12:32 -08:00
Timothy J Fontaine cc56c62ed8 build: readd missing installer resources 
This were accidentally moved during the website refactor
 2014-02-18 15:34:29 -08:00
Anton Khlynovskiy 1fa5cff4f2 docs: clarify process.stdin and old mode 2014-02-18 13:52:14 -08:00
Pedro Ballesteros 1d734a75b5 doc: stdout blocking or non-blocking behaviour 
Makes clear that the behaviour of stdout is blocking
in Linux/Unix even when they refer to pipes.
 2014-02-18 13:36:00 -08:00
Raynos abbde2fafa doc: mention objectMode for Writable streams 2014-02-18 10:29:04 -08:00
Timothy J Fontaine 937e2e351b child_process: execFileSync stderr should inherit 
If you don't set your options.stdio for execSync and execFileSync
capture and write to stderr of the parent process by default.

Fixes #7110
 2014-02-18 16:03:13 +04:00
Timothy J Fontaine 59baab2776 net: add localPort to connect options 
Expose localPort for binding to a specific port for outbound
connections.

If localAddress is not specified '0.0.0.0' is used for ip4 and '::'
for ip6 connections.

Fixes #7092
 2014-02-18 15:55:04 +04:00
Brian White a226be4f76 crypto: allow custom generator for DiffieHellman 2014-02-18 15:49:23 +04:00
Yazhong Liu 3ae0b17c76 repl: REPLServer inherits from readline.Interface 
This exposes a setPrompt for and other readline features
 2014-02-17 16:04:36 -08:00
Fedor Indutny 75ea11fc08 tls: introduce asynchronous `newSession` 
fix #7105
 2014-02-18 01:07:09 +04:00
Timothy J Fontaine 0f40eac366 Merge remote-tracking branch 'upstream/v0.10' 2014-02-14 11:05:27 -08:00
Timothy J Fontaine 86b8d84811 doc: re-add node.1 man page 
The man page was accidentally removed in 37376de for the website
refactor, bring it back.

Fixes #7117
 2014-02-14 11:01:49 -08:00
Timothy J Fontaine 6b4f72b7ac Merge remote-tracking branch 'upstream/v0.10' 
Conflicts:
	doc/blog/feature/streams2.md
 2014-02-13 16:40:38 -08:00
Timothy J Fontaine 37376debe5 website: move website to joyent/node-website 
The website will no longer be living in the source repository instead
it can be found at http://github.com/joyent/node-website
 2014-02-13 15:54:07 -08:00
Christian b222374b07 doc: changed timer id to object 
fix #7074
 2014-02-13 02:18:10 +04:00
Timothy J Fontaine e8df267674 child_process: js bits for spawnSync/execSync 
This implements the user-facing APIs that lets one run a child process
and block until it exits.

Logic shared with the async counterpart of each function was refactored
to enable code reuse.

Docs and tests are included.
 2014-02-10 13:35:37 -08:00
Timothy J Fontaine eadb4f5606 Merge remote-tracking branch 'upstream/v0.10' 
Conflicts:
	deps/v8/src/preparser.cc
	deps/v8/src/win32-math.h
	doc/api/http.markdown
	src/node_buffer.h
	src/node_crypto.cc
	src/node_file.cc
	src/node_http_parser.cc
 2014-02-08 16:45:27 -08:00
Brian White 3595139b51 doc: fix diffieHellman.getGenerator() description 2014-02-09 02:42:41 +04:00
Timothy J Fontaine e3d8359021 website: update cla email address 2014-02-07 11:17:23 -08:00
Trevor Norris 6cbfcdad46 src: move AsyncListener from process to tracing 
The AsyncListener API has been moved into the "tracing" module in order
to keep the process object free from unnecessary clutter.

Signed-off-by: Timothy J Fontaine <tjfontaine@gmail.com>
 2014-02-05 17:16:36 -08:00
Timothy J Fontaine 1d2fab37e6 doc: document the tracing api 2014-02-05 11:49:02 -08:00
Fedor Indutny 528a3ce3ed tls: more session configuration options, methods 
Introduce `ticketKeys` server option, `session` client option,
`getSession()` and `getTLSTicket()` methods.

fix #7032
 2014-02-05 23:28:34 +04:00
Benjamin Waters d2147c55c2 doc: fix references to error keyword 
References for err.signal and err.code should be error.signal and
error.code.

Fixes joyent/node#6862
 2014-02-04 12:50:24 +04:00
Yuriy Nemtsov f65ce02ddd doc: fix after message in addAsyncListener example 2014-02-04 12:44:15 +04:00
Fedor Indutny 2315703035 zlib: separate sync/async methods 2014-02-04 01:41:02 +04:00
Maxime Quandalle 154d9d2163 doc: add an example about multiple extensions 
`path.extname` returns only the last extension
 2014-02-03 12:38:40 +04:00
Nikolai Vavilov 9b37b83a20 zlib: add sync versions for convenience methods 2014-02-01 03:45:45 +04:00
Timothy J Fontaine a98d541733 blog: Post for v0.11.11 2014-01-28 19:48:54 -08:00
Wyatt Preul 8c05570258 docs: clarify origin in agent.maxSockets section 2014-01-29 03:39:54 +04:00
Timothy J Fontaine c37e1b7c4b Merge remote-tracking branch 'upstream/v0.10' 
Conflicts:
	src/node_crypto.cc
	test/simple/test-crypto.js
 2014-01-27 11:02:59 -08:00
Fedor Indutny 0ec3770767 doc: readline document TTY utils 
fix #6933
 2014-01-25 12:10:44 -08:00
Timothy J Fontaine c1b1f31203 Merge remote-tracking branch 'upstream/v0.10' 
Conflicts:
	AUTHORS
	ChangeLog
	deps/uv/AUTHORS
	deps/uv/ChangeLog
	deps/uv/src/unix/process.c
	deps/uv/src/version.c
	lib/net.js
	node.gyp
	src/node_version.h
 2014-01-24 19:13:50 -08:00
Scott González 9975ff603b doc: fix typo in readline 2014-01-24 18:56:46 +04:00
Timothy J Fontaine 5aebc73525 blog: Post for v0.10.25 2014-01-23 11:44:32 -08:00
Ben Noordhuis 74d9aa49d5 crypto: support custom pbkdf2 digest methods 
Make the HMAC digest method configurable.  Update crypto.pbkdf2() and
crypto.pbkdf2Sync() to take an extra, optional digest argument.

Before this commit, SHA-1 (admittedly the most common method) was used
exclusively.

Fixes #6553.
 2014-01-22 15:58:07 +04:00