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

5 Commits (782149ddc3c7a0ab8e72ad8afc3eb891ea0a6aef)

Author SHA1 Message Date
isaacs 5a0056703a test: Fix simple/test-http-client-timeout-agent 
Merge breakage.
 2012-09-28 09:55:29 -07:00
isaacs ae40f1c438 Merge remote-tracking branch 'ry/v0.8' into v0.8-merge 
Conflicts:
	AUTHORS
	ChangeLog
	deps/openssl/openssl.gyp
	deps/uv/src/unix/linux/linux-core.c
	deps/uv/src/unix/process.c
	deps/uv/src/unix/stream.c
	deps/v8/src/arm/builtins-arm.cc
	deps/v8/src/arm/code-stubs-arm.cc
	deps/v8/src/arm/full-codegen-arm.cc
	lib/tls.js
	src/node_version.h
	test/simple/test-http-client-timeout-agent.js
 2012-09-28 09:47:48 -07:00
isaacs ea2ceb731c test: Fix premature close in test-http-client-timeout-agent 2012-09-25 11:15:52 -07:00
Shigeki Ohtsu a1ba29d110 test: fix failing due to too early timeout 2012-09-25 14:42:59 +02:00
Frédéric Germain 451ff1540a http: Remove timeout handler when data arrives 2012-09-12 09:50:06 -07:00