BackPup/node
1
0 Fork 0
mirror of https://github.com/nodejs/node.git synced 2026-11-09 15:11:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,678 Commits 266 Branches 972 Tags
v0.12.7
Commit Graph
10678 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Gilli d3492aa7b3 2015.07.09, Version 0.12.7 (Stable) 
* openssl: upgrade to 1.0.1p (CVE-2015-1793)

* npm: upgrade to 2.11.3

* V8: cherry-pick JitCodeEvent patch from upstream (Ben Noordhuis)

* win,msi: create npm folder in AppData directory (Steven Rockarts)
v0.12.7 		2015-07-09 15:41:19 -07:00
Julien Gilli 9c5e9fc155 Merge remote-tracking branch 'upstream/v0.10' into v0.12 
Conflicts:
	AUTHORS
	ChangeLog
	deps/v8/src/log.cc
	src/node_version.h
 2015-07-09 15:30:29 -07:00
Julien Gilli e5aaa34ba0 Now working on 0.10.41 2015-07-09 14:58:52 -07:00
Julien Gilli 26bb1ad137 Merge branch 'v0.10.40-release' into v0.10 2015-07-09 14:58:16 -07:00
Julien Gilli 0439a28d51 2015.07.09, Version 0.10.40 (Maintenance) 
* openssl: upgrade to 1.0.1p

* V8: back-port JitCodeEvent patch from upstream (Ben Noordhuis)

* win,msi: create npm folder in AppData directory (Steven Rockarts)
v0.10.40 		2015-07-09 14:19:36 -07:00
Shigeki Ohtsu c5d7b31528 openssl: fix keypress requirement in apps on win32 
reapply b910613792

PR: #9451
PR-URL: https://github.com/joyent/node/pull/9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

PR: #25523
PR-URL: https://github.com/joyent/node/pull/25523
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>

PR: #25654
PR-URL: https://github.com/joyent/node/pull/25654
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
 2015-07-09 14:09:03 -07:00
Fedor Indutny 7ad593877e deps: fix openssl assembly error on ia32 win32 
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and
perhaps others) are requiring .686 .

PR: #9451
PR-URL: https://github.com/joyent/node/pull/9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

PR: #25523
PR-URL: https://github.com/joyent/node/pull/25523
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>

PR: #25654
PR-URL: https://github.com/joyent/node/pull/25654
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
 2015-07-09 14:09:03 -07:00
Shigeki Ohtsu 984e7f9e40 deps: separate sha256/sha512-x86_64.pl for openssl 
sha256-x86_64.pl does not exist in the origin openssl distribution. It
was copied from sha512-x86_64.pl and both sha256/sha512 scripts were
modified so as to generates only one asm file specified as its key
hash length.

PR: #9451
PR-URL: https://github.com/joyent/node/pull/9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

PR: #25523
PR-URL: https://github.com/joyent/node/pull/25523
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>

PR: #25654
PR-URL: https://github.com/joyent/node/pull/25654
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
 2015-07-09 14:09:03 -07:00
Shigeki Ohtsu 8277822344 deps: copy all openssl header files to include dir 
All symlink files in `deps/openssl/openssl/include/openssl/`
 are removed and replaced with real header files to avoid
issues on Windows.

PR: #25654
PR-URL: https://github.com/joyent/node/pull/25654
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
 2015-07-09 14:09:03 -07:00
Shigeki Ohtsu 0cf9f27703 deps: upgrade openssl sources to 1.0.1p 
This just replaces all sources of openssl-1.0.1p.tar.gz
into deps/openssl/openssl.

PR: #25654
PR-URL: https://github.com/joyent/node/pull/25654
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
 2015-07-09 14:09:03 -07:00
Julien Gilli 6b489e62d0 Now working on 0.12.7 2015-07-03 19:35:14 -07:00
Julien Gilli 9d3288c843 Merge branch 'v0.12.6-release' into v0.12 2015-07-03 19:34:23 -07:00
Julien Gilli 0be9a77bb1 2015.07.03, Version 0.12.6 (Stable) 
* V8: fix out-of-band write in utf8 decoder
v0.12.6 		2015-07-03 17:33:28 -07:00
Fedor Indutny 78b0e30954 deps: fix out-of-band write in utf8 decoder 
Originally reported by: Kris Reeves <kris.re@bbhmedia.com>

Reviewed-By: Trevor Norris <trev.norris@gmail.com>
 2015-07-03 17:32:01 -07:00
Michael Dawson dbda13abb6 test: Fix test-npm Makefile target for npm 2.8.4 
Changes in npm 2.8.4 broke the test-npm target.  This change
updates to allow the tests to run once again

Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25294
 2015-07-02 15:08:08 -07:00
João Reis 8294f32cff test: mark microtask-queue-run(-domain) as flaky 
test-microtask-queue-run and test-microtask-queue-run-domain fail very
rarely at least on linux x64, windows 2012r2 x64 and smartos x86

Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
PR-URL: https://github.com/joyent/node/pull/25606
 2015-07-02 11:01:46 -07:00
Steven Rockarts 4ffbce417c win,msi: create npm folder in AppData directory 
Create the empty npm folder in Roaming\Appdata so that non-Administrator
users have a place to store global packages. This fixes the error Error:
ENOENT, stat error that occurs when a user tries to run the npm install
<package> command.

Bug: https://github.com/joyent/node/issues/8141
PR: https://github.com/joyent/node/pull/8838
Reviewed-by: Bert Belder <bertbelder@gmail.com>
 2015-07-01 11:06:52 -07:00
Steven Rockarts 18d413d299 win,msi: create npm folder in AppData directory 
Create the empty npm folder in Roaming\Appdata so that non-Administrator
users have a place to store global packages. This fixes the error Error:
ENOENT, stat error that occurs when a user tries to run the npm install
<package> command.

Bug: https://github.com/joyent/node/issues/8141
PR: https://github.com/joyent/node/pull/8838
Reviewed-by: Bert Belder <bertbelder@gmail.com>
 2015-07-01 11:06:07 -07:00
yangguo@chromium.org 13ea50e927 V8: remove V8_HOST_CAN_READ_UNALIGNED and its uses 
Fixes segfault in 32bit SmartOS when built with GCC 4.9.

This is the second of two backports from upstream v8:
1. https://github.com/v8/v8-git-mirror/commit/90dc5c9e66ef1778cb8425c43c2f37b6799260c3
2. https://github.com/v8/v8-git-mirror/commit/7cb82a76b46ef18f8e05d40d4fe13b3410d446e4

Original commit message:

  Reland "Remove V8_HOST_CAN_READ_UNALIGNED and its uses."

  BUG=chromium:412967
  LOG=N
  R=jkummerow@chromium.org

  Review URL: https://codereview.chromium.org/571903002

  git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23938 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

V8 issue: https://code.google.com/p/chromium/issues/detail?id=412967

Fixes #25281

Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25556
 2015-07-01 08:37:03 -07:00
yangguo@chromium.org 48b0ca2616 V8: do not use wide reads in CopyCharsUnsigned 
Fixes segfault in 32bit SmartOS when built with GCC 4.9.

This is the first of two backports from upstream v8:
1. https://github.com/v8/v8-git-mirror/commit/90dc5c9e66ef1778cb8425c43c2f37b6799260c3
2. https://github.com/v8/v8-git-mirror/commit/7cb82a76b46ef18f8e05d40d4fe13b3410d446e4

Original commit message:

  Do not use wide reads in CopyCharsUnsigned.

  R=jkummerow@chromium.org
  BUG=chromium:412967
  LOG=Y

  Review URL: https://codereview.chromium.org/566583002

  git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23876 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

V8 issue: https://code.google.com/p/chromium/issues/detail?id=412967

Fixes #25281

Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25556
 2015-07-01 08:37:03 -07:00
Ben Noordhuis 88a27a9621 v8: cherry-pick JitCodeEvent patch from upstream 
Original commit log follows:

    Meaningful name for builtins in JitCodeEvent API.

    Report builtins by name (e.g. "Builtin:ArgumentsAdaptorTrampoline")
    instead of labeling everything "Builtin:A builtin from the snapshot"

    Review URL: https://codereview.chromium.org/1216833002

Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
PR-URL: https://github.com/joyent/node/pull/25589
 2015-06-29 13:48:15 -07:00
Ben Noordhuis 5a60e0d904 v8: back-port JitCodeEvent patch from upstream 
Original commit log follows:

    Meaningful name for builtins in JitCodeEvent API.

    Report builtins by name (e.g. "Builtin:ArgumentsAdaptorTrampoline")
    instead of labeling everything "Builtin:A builtin from the snapshot"

    Review URL: https://codereview.chromium.org/1216833002

Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
PR-URL: https://github.com/joyent/node/pull/25588
 2015-06-29 13:35:22 -07:00
Ben Noordhuis 5fc4fb108b src: fix signed/unsigned comparison warning 
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
PR-URL: https://github.com/joyent/node/pull/25588
 2015-06-29 13:35:22 -07:00
Forrest L Norvell 8917e430b8 deps: upgrade to npm 2.11.3 
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25545
 2015-06-26 12:52:29 -07:00
Julien Gilli c3e02aeba6 Now working on 0.12.6 2015-06-22 12:53:07 -07:00
Julien Gilli e359e01f93 Merge branch 'v0.12.5-release' into v0.12 2015-06-22 12:52:51 -07:00
Julien Gilli 61c6abf008 2015.06.22, Version 0.12.5 (Stable) 
* openssl: upgrade to 1.0.1o (Addressing multiple CVEs)

* npm: upgrade to 2.11.2

* uv: upgrade to 1.6.1

* V8: avoid deadlock when profiling is active (Dmitri Melikyan)

* install: fix source path for openssl headers (Oguz Bastemur)

* install: make sure opensslconf.h is overwritten (Oguz Bastemur)

* timers: fix timeout when added in timer's callback (Julien Gilli)

* windows: broadcast WM_SETTINGCHANGE after install (Mathias Küsel)
v0.12.5 		2015-06-22 11:22:53 -07:00
Julien Gilli f50c37d993 Merge remote-tracking branch 'upstream/v0.10' into v0.12 
Conflicts:
	AUTHORS
	ChangeLog
	lib/timers.js
	src/node_version.h
	test/common.js
 2015-06-22 11:11:51 -07:00
Julien Gilli 6f8400a11c Now working on 0.10.40 2015-06-22 09:45:56 -07:00
Julien Gilli 3a1d4b7257 Merge branch 'v0.10.39-release' into v0.10 2015-06-22 09:45:28 -07:00
Julien Gilli 615a35ccd2 2015.06.18, Version 0.10.39 (Maintenance) 
* openssl: upgrade to 1.0.1o (Addressing multiple CVEs)

* install: fix source path for openssl headers (Oguz Bastemur)

* install: make sure opensslconf.h is overwritten (Oguz Bastemur)

* timers: fix timeout when added in timer's callback (Julien Gilli)

* windows: broadcast WM_SETTINGCHANGE after install (Mathias Küsel)
v0.10.39 		2015-06-18 22:57:52 -07:00
Julien Gilli dcb7ef2e40 tls: revert disable RC4 and cipher lists changes 
This reverts commit 67d9a56251.

This commit actually reverts both
67d9a56251 and
02a549ed2b (both related to ciphers list
changes). It does it in one commit because reverting
02a549ed2b results in an empty commit.

These changes are not yet ready to be released, and before they are we
want to be able to publish new releases. We're reverting them so that we
can submit a new PR that will contain all these changes plus what's
necessary to be able to land them properly.

Conflicts:
	src/node.cc

PR: #25511
PR-URL: https://github.com/joyent/node/pull/25511
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
 2015-06-18 22:37:10 -07:00
Rebecca Turner 20d8db1a42 deps: upgrade to npm 2.11.2 
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25517
 2015-06-18 16:29:39 -07:00
Shigeki Ohtsu 139dbe8bb7 test: remove 512 bits test in test-tls-dhe.js 
Test of 512 bits key is failed after upgrading openssl-1.0.1o due to
its limit of 768 bits key size. Remove it and start from 1024 bits
test.

Reviewed-By: Michael Dawson <mdawson@devrus.com>
PR-URL: https://github.com/joyent/node/pull/25533
 2015-06-17 15:20:53 -07:00
Shigeki Ohtsu 9463cfae33 openssl: fix keypress requirement in apps on win32 
reapply b910613792

PR: #9451
PR-URL: https://github.com/joyent/node/pull/9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

PR: #25523
PR-URL: https://github.com/joyent/node/pull/25523
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
 2015-06-17 12:55:20 -07:00
Fedor Indutny 81e30a11ba deps: fix openssl assembly error on ia32 win32 
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and
perhaps others) are requiring .686 .

PR: #9451
PR-URL: https://github.com/joyent/node/pull/9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

PR: #25523
PR-URL: https://github.com/joyent/node/pull/25523
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
 2015-06-17 12:55:20 -07:00
Shigeki Ohtsu 3937563d9a deps: separate sha256/sha512-x86_64.pl for openssl 
sha256-x86_64.pl does not exist in the origin openssl distribution. It
was copied from sha512-x86_64.pl and both sha256/sha512 scripts were
modified so as to generates only one asm file specified as its key
hash length.

PR: #9451
PR-URL: https://github.com/joyent/node/pull/9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

PR: #25523
PR-URL: https://github.com/joyent/node/pull/25523
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
 2015-06-17 12:55:20 -07:00
Shigeki Ohtsu ee9545469d deps: replace all headers in openssl 
Change all openssl/include/openssl/*.h to include resolved symbolic
links and openssl/crypto/opensslconf.h to refer config/opensslconf.h.

PR: #25523
PR-URL: https://github.com/joyent/node/pull/25523
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
 2015-06-17 12:55:19 -07:00
Shigeki Ohtsu 456c22f63f deps: upgrade to openssl-1.0.1o 
This just replaces all sources of openssl-1.0.1o.tar.gz into
deps/openssl/openssl.

PR: #25523
PR-URL: https://github.com/joyent/node/pull/25523
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
 2015-06-17 12:55:19 -07:00
Julien Gilli d38e865fce timers: fix timeout when added in timer's callback 
When a timer is added in another timer's callback, its underlying timer
handle will be started with a timeout that is actually incorrect.

The reason is that  the value that represents the current time is not
updated between the time the original callback is called and the time
the added timer is processed by timers.listOnTimeout. That leads the
logic in timers.listOnTimeout to do an incorrect computation that makes
the added timer fire with a timeout of scheduledTimeout +
timeSpentInCallback.

This change fixes that and make timers scheduled within other timers'
callbacks fire as expected.

Fixes #9333 and #15447.

PR: #17203
PR-URL: https://github.com/joyent/node/pull/17203
Reviewed-By: Fedor Indutny <fedor@indutny.com>
 2015-06-17 11:36:38 -07:00
Trevor Norris 097607c782 build: fix use of strict aliasing 
The -fno-strict-aliasing flag was added to fix compilation warnings when
building Node.js with GCC <= 4.4

PR: #25141

Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25475
 2015-06-16 15:50:24 -07:00
Saúl Ibarra Corretgé 50f961596d deps: update libuv to version 1.6.1 
Fixes: https://github.com/joyent/node/issues/9310

Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25475
 2015-06-16 15:50:23 -07:00
Kat Marchán 69967c67ab deps: upgrade to npm 2.11.1 
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25482
 2015-06-11 12:43:32 -07:00
Dmitri Melikyan b81a643f9a V8: avoid deadlock when profiling is active 
A deadlock happens when sampler initiated by SIGPROF tries to lock
the thread and the thread is already locked by the same thread. As
a result, other thread involved in sampling process hangs. The
patch adds a check for thread lock before continuing sampler
operation.

The fix has been tested on a sample app under load with and without
profiling turned on.

Fixes issue #14576 and specifically the duplicate issue #25295

Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25309
 2015-06-10 10:32:03 -07:00
Shigeki Ohtsu 10349829f2 test: add -no_rand_screen for tls-server-verify 
This improves the performance of openssl s_client on Windows and
gains several seconds to finish test-tls-server-verify.

(cherry picked from commit 2ff517e0e410ea33ba5a3d289a82fc315d120e8e)

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/joyent/node/pull/25368
 2015-06-04 05:24:05 -07:00
Shigeki Ohtsu fa4aa347eb deps: add -no_rand_screen to openssl s_client 
In openssl s_client on Windows, RAND_screen() is invoked to initialize
random state but it takes several seconds in each connection.
This added -no_rand_screen to openssl s_client on Windows to skip
RAND_screen() and gets a better performance in the unit test of
test-tls-server-verify.
Do not enable this except to use in the unit test.

(cherry picked from commit 9f0f7c38e6df975dd39735d0e9ef968076369c74)

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/joyent/node/pull/25368
 2015-06-04 05:24:04 -07:00
Shigeki Ohtsu cb63d93e03 test: kill child in tls-server-verify for speed up 
For better performance of the test, the parent kills child processes
so as not to wait them to be ended.

(cherry picked from commit 833b23636045f7afc929196139021630a390391a)

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/joyent/node/pull/25368
 2015-06-04 05:24:04 -07:00
Alexis Campailla 83b7c07421 test,win: re-enable tls-server-verify in CI 
Now that the test is fixed, node-accept-pull-request should
fail when the test fails.

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/joyent/node/pull/25368
 2015-06-04 05:24:04 -07:00
João Reis 29bbb32171 test: improve console output of tls-server-verify 
When running in parallel, it is not easy to identify what server and
client failed when the test fails. This adds identifiers to all lines
of console output.

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/joyent/node/pull/25368
 2015-06-04 05:24:03 -07:00
João Reis 6d3450511b test: run tls-server-verify servers in parallel 
Different servers must use different ports. Since we can count only on
common.PORT and common.PORT+1, run only 2 servers in parallel.

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/joyent/node/pull/25368
 2015-06-04 05:24:03 -07:00