summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 2015.07.09, Version 0.12.7 (Stable)v0.12.7v0.12.7-releaseJulien Gilli2015-07-092-2/+13
| | | | | | | | | | * 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)
* Merge remote-tracking branch 'upstream/v0.10' into v0.12Julien Gilli2015-07-09114-328/+37859
|\ | | | | | | | | | | | | | | Conflicts: AUTHORS ChangeLog deps/v8/src/log.cc src/node_version.h
| * Now working on 0.10.41Julien Gilli2015-07-091-2/+2
| |
| * Merge branch 'v0.10.40-release' into v0.10Julien Gilli2015-07-093-2/+12
| |\
| | * 2015.07.09, Version 0.10.40 (Maintenance)v0.10.40v0.10.40-releaseJulien Gilli2015-07-093-2/+12
| |/ | | | | | | | | | | | | | | * 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)
| * openssl: fix keypress requirement in apps on win32Shigeki Ohtsu2015-07-091-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reapply b910613792dac946b295855963869933a9089044 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>
| * deps: fix openssl assembly error on ia32 win32Fedor Indutny2015-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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>
| * deps: separate sha256/sha512-x86_64.pl for opensslShigeki Ohtsu2015-07-092-25/+449
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * deps: copy all openssl header files to include dirShigeki Ohtsu2015-07-0976-316/+36986
| | | | | | | | | | | | | | | | | | | | 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>
| * deps: upgrade openssl sources to 1.0.1pShigeki Ohtsu2015-07-09118-792/+1213
| | | | | | | | | | | | | | | | | | 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>
| * win,msi: create npm folder in AppData directorySteven Rockarts2015-07-011-0/+12
| | | | | | | | | | | | | | | | | | | | | | 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>
| * v8: back-port JitCodeEvent patch from upstreamBen Noordhuis2015-06-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * src: fix signed/unsigned comparison warningBen Noordhuis2015-06-291-1/+1
| | | | | | | | | | Reviewed-By: Colin Ihrig <cjihrig@gmail.com> PR-URL: https://github.com/joyent/node/pull/25588
* | Now working on 0.12.7Julien Gilli2015-07-031-2/+2
| |
* | Merge branch 'v0.12.6-release' into v0.12Julien Gilli2015-07-035-8/+20
|\ \
| * | 2015.07.03, Version 0.12.6 (Stable)v0.12.6v0.12.6-releaseJulien Gilli2015-07-032-2/+7
| | | | | | | | | | | | * V8: fix out-of-band write in utf8 decoder
| * | deps: fix out-of-band write in utf8 decoderFedor Indutny2015-07-033-6/+13
| | | | | | | | | | | | | | | | | | Originally reported by: Kris Reeves <kris.re@bbhmedia.com> Reviewed-By: Trevor Norris <trev.norris@gmail.com>
* | | test: Fix test-npm Makefile target for npm 2.8.4Michael Dawson2015-07-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | test: mark microtask-queue-run(-domain) as flakyJoão Reis2015-07-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | win,msi: create npm folder in AppData directorySteven Rockarts2015-07-011-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | V8: remove V8_HOST_CAN_READ_UNALIGNED and its usesyangguo@chromium.org2015-07-0111-110/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | V8: do not use wide reads in CopyCharsUnsignedyangguo@chromium.org2015-07-011-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | v8: cherry-pick JitCodeEvent patch from upstreamBen Noordhuis2015-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | deps: upgrade to npm 2.11.3Forrest L Norvell2015-06-26159-463/+936
|/ / | | | | | | | | Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR-URL: https://github.com/joyent/node/pull/25545
* | Now working on 0.12.6Julien Gilli2015-06-221-2/+2
| |
* | Merge branch 'v0.12.5-release' into v0.12Julien Gilli2015-06-223-2/+24
|\ \
| * | 2015.06.22, Version 0.12.5 (Stable)v0.12.5v0.12.5-releaseJulien Gilli2015-06-223-2/+24
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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)
* | Merge remote-tracking branch 'upstream/v0.10' into v0.12Julien Gilli2015-06-22226-941/+2818
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: AUTHORS ChangeLog lib/timers.js src/node_version.h test/common.js
| * Now working on 0.10.40Julien Gilli2015-06-221-2/+2
| |
| * Merge branch 'v0.10.39-release' into v0.10Julien Gilli2015-06-223-2/+19
| |\
| | * 2015.06.18, Version 0.10.39 (Maintenance)v0.10.39v0.10.39-releaseJulien Gilli2015-06-183-2/+19
| |/ | | | | | | | | | | | | | | | | | | | | | | * 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)
| * tls: revert disable RC4 and cipher lists changesJulien Gilli2015-06-187-224/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 67d9a56251c4491beacb666ba5833574d0cf0d12. This commit actually reverts both 67d9a56251c4491beacb666ba5833574d0cf0d12 and 02a549ed2b2afe85d8ff0335b6684ad54023afb7 (both related to ciphers list changes). It does it in one commit because reverting 02a549ed2b2afe85d8ff0335b6684ad54023afb7 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>
| * openssl: fix keypress requirement in apps on win32Shigeki Ohtsu2015-06-171-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | reapply b910613792dac946b295855963869933a9089044 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>
| * deps: fix openssl assembly error on ia32 win32Fedor Indutny2015-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | `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>
| * deps: separate sha256/sha512-x86_64.pl for opensslShigeki Ohtsu2015-06-172-25/+449
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * deps: replace all headers in opensslShigeki Ohtsu2015-06-1776-316/+76
| | | | | | | | | | | | | | | | | | 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>
| * deps: upgrade to openssl-1.0.1oShigeki Ohtsu2015-06-17290-1474/+2762
| | | | | | | | | | | | | | | | | | 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>
| * timers: fix timeout when added in timer's callbackJulien Gilli2015-06-173-1/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * win,msi: broadcast WM_SETTINGCHANGE after installMathias Küsel2015-05-117-0/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport 668bde8ac0d16382cbc98c904d8b5f55fd9fd9f0 from io.js. Original commit message follows: In theory the msi should broadcast a 'WM_SETTINGCHANGE' message to all windows after modifying the PATH environment variable. This ensures that the new PATH is visible to other processes without restarting windows (although it's still necessary to close and reopen active console windows). Unfortunately, the broadcast doesn't always happen, for unknown reasons. That's why this patch adds a custom action that unconditionally broadcasts a WM_SETTINGCHANGE message. Bug: https://github.com/iojs/io.js/issues/603 PR: https://github.com/iojs/io.js/pull/613 Reviewed-by: Bert Belder <bertbelder@gmail.com> (cherry picked from commit 668bde8ac0d16382cbc98c904d8b5f55fd9fd9f0) --Node.js commmit metadata-- PR-URL: https://github.com/joyent/node/pull/25100 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> Fixes: https://github.com/joyent/node/issues/4356
| * win,msi: Added empty InstallExecuteSequence groupJoão Reis2015-05-111-0/+3
| | | | | | | | | | | | | | | | | | | | This is needed so that we can backport 668bde8ac0d16382cbc98c904d8b5f55fd9fd9f0 from io.js with a clean merge. PR-URL: https://github.com/joyent/node/pull/25100 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> Fixes: https://github.com/joyent/node/issues/4356
| * install: make sure opensslconf.h is overwrittenOguz Bastemur2015-04-231-1/+1
| | | | | | | | | | | | | | | | PR: #14089 PR-URL: https://github.com/joyent/node/pull/14089 Reviewed-By: Trevor Norris <trev.norris@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
| * install: fix source path for openssl headersOguz Bastemur2015-04-231-1/+1
| | | | | | | | | | | | | | | | PR: #14089 PR-URL: https://github.com/joyent/node/pull/14089 Reviewed-By: Trevor Norris <trev.norris@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
| * docs: clarify usage of stream.Writable.writeAlexKVal2015-04-151-3/+9
| | | | | | | | | | | | | | | | | | Add separate sample code for the write-after-end case to avoid confusion. PR: #15517 PR-URL: https://github.com/joyent/node/pull/15517 Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
| * doc: add link to workflow in api docs menuPaulo McNally2015-04-101-0/+1
| | | | | | | | | | | | | | | | | | Added link to workflow guidelines page in API docs' navigation menu. Fixes https://github.com/joyent/node-website/issues/102. Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR-URL: https://github.com/joyent/node/pull/14570
| * tls: make the --enable-legacy-cipher-list help less verboseJames M Snell2015-04-081-4/+2
| | | | | | | | | | | | | | | | Per feedback on the commit, make the PrintHelp for --enable-legacy-cipher-list less verbose. Reviewed-By: James M Snell <jasnell@gmail.com> PR-URL: https://github.com/joyent/node/pull/14413
| * tls: disable RC4, add --cipher-list command line switchJames M Snell2015-04-087-12/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable RC4 in the default cipher list Add the `--cipher-list` command line switch and `NODE_CIPHER_LIST` environment variable to completely override the default cipher list. Add the `--enable-legacy-cipher-list` and `NODE_LEGACY_CIPHER_LIST` environment variable to selectively enable the default cipher list from previous node.js releases. Reviewed-By: James M Snell <jasnell@gmail.com> PR-URL: https://github.com/joyent/node/pull/14413
* | deps: upgrade to npm 2.11.2Rebecca Turner2015-06-18279-9791/+1311
| | | | | | | | | | Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR-URL: https://github.com/joyent/node/pull/25517
* | test: remove 512 bits test in test-tls-dhe.jsShigeki Ohtsu2015-06-173-14/+2
| | | | | | | | | | | | | | | | | | 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
* | build: fix use of strict aliasingTrevor Norris2015-06-161-0/+6
| | | | | | | | | | | | | | | | | | | | 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
* | deps: update libuv to version 1.6.1Saúl Ibarra Corretgé2015-06-1653-371/+928
| | | | | | | | | | | | | | 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
View Lorry Controller Status