Permalink
Browse files

Merge branch 'v0.6'

Conflicts:
	ChangeLog
	doc/template.html
	lib/cluster.js
	lib/http.js
	lib/tls.js
	src/node.h
	src/node_version.h
	test/simple/test-cluster-kill-workers.js
  • Loading branch information...
2 parents 2433eeb + 6c0c00a commit 667aae596cded9336f50574386683ec39ada43f2 @indutny indutny committed Jan 23, 2012
Showing with 1,874 additions and 385 deletions.
  1. +5 −0 AUTHORS
  2. +26 −1 ChangeLog
  3. +542 −5 doc/api/addons.markdown
  4. +1 −1 doc/api/appendix_1.markdown
  5. +5 −1 doc/community/index.html
  6. +7 −7 doc/index.html
  7. +1 −1 doc/logos/index.html
  8. +7 −3 lib/child_process.js
  9. +26 −8 lib/dgram.js
  10. +19 −3 lib/http.js
  11. +2 −2 lib/path.js
  12. +10 −9 lib/tls.js
  13. +7 −0 lib/tty.js
  14. +13 −14 lib/util.js
  15. +12 −8 lib/zlib.js
  16. +1 −0 src/node_crypto.cc
  17. +73 −0 src/udp_wrap.cc
  18. +15 −0 src/v8_typed_array.cc
  19. +1 −1 test/common.js
  20. +2 −2 test/internet/test-dns.js
  21. +1 −1 test/message/throw_custom_error.js
  22. +1 −1 test/message/throw_non_error.js
  23. +7 −7 test/pummel/test-net-timeout2.js
  24. +1 −1 test/simple/test-assert.js
  25. +10 −5 test/simple/test-child-process-double-pipe.js
  26. +3 −3 test/simple/test-child-process-fork2.js
  27. +59 −0 test/simple/test-cluster-uncaught-exception.js
  28. +4 −5 test/simple/test-crypto-ecb.js
  29. +160 −0 test/simple/test-dgram-broadcast-multi-process.js
  30. +160 −0 test/simple/test-dgram-multicast-multi-process.js
  31. +41 −0 test/simple/test-dgram-multicast-setTTL.js
  32. +2 −2 test/simple/test-dgram-send-error.js
  33. +2 −2 test/simple/test-eval.js
  34. +8 −8 test/simple/test-executable-path.js
  35. +4 −2 test/simple/test-fs-long-path.js
  36. +1 −1 test/simple/test-fs-mkdir.js
  37. +4 −6 test/simple/test-fs-symlink.js
  38. +5 −5 test/simple/test-fs-utimes.js
  39. +4 −2 test/simple/test-http-1.0.js
  40. +1 −1 test/simple/test-http-abort-before-end.js
  41. +54 −0 test/simple/test-http-parser-free.js
  42. +3 −3 test/simple/test-http-res-write-end-dont-take-array.js
  43. +5 −4 test/simple/test-http-response-no-headers.js
  44. +71 −0 test/simple/test-http-should-keep-alive.js
  45. +10 −5 test/simple/test-init.js
  46. +7 −6 test/simple/test-module-load-list.js
  47. +1 −1 test/simple/test-net-connect-buffer.js
  48. +12 −14 test/simple/test-net-pipe-connect-errors.js
  49. +48 −46 test/simple/test-net-server-max-connections.js
  50. +4 −4 test/simple/test-path-makelong.js
  51. +35 −3 test/simple/test-path.js
  52. +41 −40 test/simple/test-punycode.js
  53. +1 −1 test/simple/test-readdir.js
  54. +6 −4 test/simple/test-regress-GH-1899.js
  55. +10 −5 test/simple/test-regress-GH-877.js
  56. +10 −13 test/simple/test-repl-.save.load.js
  57. +55 −46 test/simple/test-repl-tab-complete.js
  58. +4 −2 test/simple/test-script-context.js
  59. +2 −2 test/simple/test-setproctitle.js
  60. +1 −1 test/simple/test-stdin-child-proc.js
  61. +6 −6 test/simple/test-stdin-pause-resume.js
  62. +45 −0 test/simple/test-tls-client-abort2.js
  63. +1 −1 test/simple/test-tls-passphrase.js
  64. +3 −3 test/simple/test-tls-session-cache.js
  65. +2 −1 test/simple/test-tls-set-ciphers.js
  66. +1 −1 test/simple/test-tty-stdout-end.js
  67. +48 −0 test/simple/test-typed-arrays-typenames.js
  68. +24 −3 test/simple/test-util-inspect.js
  69. +37 −37 test/simple/test-util.js
  70. +1 −1 test/simple/test-zlib-from-gzip.js
  71. +28 −7 test/simple/test-zlib-from-string.js
  72. +38 −0 test/simple/test-zlib-invalid-input.js
  73. +7 −7 test/simple/test-zlib-random-byte-pipes.js
View
@@ -253,3 +253,8 @@ Dave Irvine <davman99@gmail.com>
Ju-yeong Park <interruptz@gmail.com>
Phil Sung <psung@dnanexus.com>
Damon Oehlman <damon.oehlman@sidelab.com>
+Ryunosuke SATO <tricknotes.rs@gmail.com>
+Michael Bernstein <michaelrbernstein@gmail.com>
+Guillermo Rauch <rauchg@gmail.com>
+Dan Williams <dan@igniter.com>
+Brandon Benvie <brandon@bbenvie.com>
View
@@ -13,7 +13,32 @@
* Bug fixes
-2012.01.06, Version 0.6.7 (stable)
+2012.01.19, Version 0.6.8 (stable)
+
+* Update V8 to 3.6.6.19
+
+* Numeric key hash collision fix for V8 (Erik Corry, Fedor Indutny)
+
+* Add missing TTY key translations for F1-F5 on Windows (Brandon Benvie)
+
+* path.extname bugfix with . and .. paths (Bert Belder)
+
+* cluster: don't always kill the master on uncaughtException (Ben Noordhuis)
+
+* Update npm to 1.1.0-2 (isaacs)
+
+* typed arrays: set class name (Ben Noordhuis)
+
+* zlib binding cleanup (isaacs, Bert Belder)
+
+* dgram: use slab memory allocator (Michael Bernstein)
+
+* fix segfault #2473
+
+* #2521 60% improvement in fs.stat on Windows (Igor Zinkovsky)
+
+
+2012.01.06, Version 0.6.7 (stable), d5a189acef14a851287ee555f7a39431fe276e1c
* V8 hash collision fix (Breaks MIPS) (Bert Belder, Erik Corry)
Oops, something went wrong. Retry.

0 comments on commit 667aae5

Please sign in to comment.