summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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
* | deps: upgrade to npm 2.11.1Kat Marchán2015-06-11620-8092/+22609
| | | | | | | | | | Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR-URL: https://github.com/joyent/node/pull/25482
* | V8: avoid deadlock when profiling is activeDmitri Melikyan2015-06-103-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | test: add -no_rand_screen for tls-server-verifyShigeki Ohtsu2015-06-041-0/+3
| | | | | | | | | | | | | | | | | | | | 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
* | deps: add -no_rand_screen to openssl s_clientShigeki Ohtsu2015-06-042-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | test: kill child in tls-server-verify for speed upShigeki Ohtsu2015-06-041-2/+8
| | | | | | | | | | | | | | | | | | | | 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
* | test,win: re-enable tls-server-verify in CIAlexis Campailla2015-06-041-1/+0
| | | | | | | | | | | | | | | | 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
* | test: improve console output of tls-server-verifyJoão Reis2015-06-041-16/+19
| | | | | | | | | | | | | | | | | | 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
* | test: run tls-server-verify servers in parallelJoão Reis2015-06-041-10/+12
| | | | | | | | | | | | | | | | 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
* | test: running tls-server-verify clients in parallelJoão Reis2015-06-041-1/+15
| | | | | | | | | | | | | | | | | | | | OpenSSL s_client introduces some delay on Windows. With all clients running sequentially, this delay is big enough to break CI. This fix runs the clients in parallel (unless the test includes renegotiation), reducing the total run time. Reviewed-By: James M Snell <jasnell@gmail.com> PR-URL: https://github.com/joyent/node/pull/25368
* | Now working on 0.12.5Julien Gilli2015-05-221-2/+2
| |
* | Merge branch 'v0.12.4-release' into v0.12Julien Gilli2015-05-223-2/+13
|\ \
| * | 2015.05.22, Version 0.12.4 (Stable)v0.12.4v0.12.4-releaseJulien Gilli2015-05-223-2/+13
|/ / | | | | | | | | | | | | | | * npm: upgrade to 2.10.1 * V8: revert v8 Array.prototype.values() removal (cjihrig) * win: bring back xp/2k3 support (Bert Belder)
* | deps: upgrade to npm 2.10.1Rebecca Turner2015-05-22283-2770/+6270
| | | | | | | | | | Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR-URL: https://github.com/joyent/node/pull/25364
* | win: bring back xp/2k3 supportBert Belder2015-05-222-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: https://github.com/joyent/node/issues/25348 The gyp/project files don't explicitly specify a subsystem version, which results in the default being used. The default changed from VS 2010 to VS 2012 and later. Backport e8d08503c7821e8c92e9fa236ed7328e9bdfe62a from io.js. Original commit message follows: Chrome still runs on Windows XP, so there is no reason that iojs couldn't. PR: https://github.com/iojs/io.js/pull/512 (cherry picked from commit e8d08503c7821e8c92e9fa236ed7328e9bdfe62a) Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR-URL: https://github.com/joyent/node/pull/25367
* | test: Array.prototype.values() regression testcjihrig2015-05-221-0/+36
| | | | | | | | | | | | | | | | This commit adds a regression test for https://github.com/joyent/node/issues/25324 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR-URL: https://github.com/joyent/node/pull/25328
* | deps: revert v8 Array.prototype.values() removalcjihrig2015-05-226-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Node 0.12 line was initially released with a version of v8 that included Array.prototype.values(). In https://github.com/joyent/node/pull/18206, v8 was updated to a version that dropped support for values(). https://codereview.chromium.org/647703003 removed this method because it causes problems with some versions of Outlook Web Access. This commit reverts the removal of Array.prototype.values(). Original commit message: Revert "Version 3.28.71.17 (merged r24706, r24708)" This reverts commit 529541ecb58fd0d6df4dfbe41d01bff9ae21ff06. Conflicts: src/version.cc Reviewed-By: Julien Gilli <julien.gilli@joyent.com> PR-URL: https://github.com/joyent/node/pull/25328
* | doc: Using ciphers with tls.connect()Chad Johnston2015-05-211-1/+16
| | | | | | | | | | | | | | Refs #25270,#25271 Reviewed-By: Michael Dawson <mhdawsonibm@gmail.com> PR-URL: https://github.com/joyent/node/pull/25325
* | test: relax timing constraints for child processGireesh Punathil2015-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With additional load in the system, the child process which runs sleep command takes more time to run - typically slightly above 1 second, but above 2 seconds under stress. While the intent of the test is to test the functionality of spawnSync and the child process in general, in effect it is testing the system command sleep, and further, it's responsiveness. Since from the name the purpose of the test seems to be unrelated to the sleep behaviour, I believe a more meaningful assertion would be to see the time taken is more than 1 second. Reviewed-By: Michael Dawson <mhdawsonibm@gmail.com> PR-URL: https://github.com/joyent/node/pull/25291
* | test: delete simple/test-process-active-wrapsMichael Dawson2015-05-141-79/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test currently fails when run on machines without IPv6 enabled. Futher it was delete in io.js under 3143d732f6efd82da76e9c53ad192ac14071bf70 as the test was known to have problems across platforms and releases. The existing test was hard to understand so I wrote a new version but then found exactly what was reported in the io.js pull request. Behaviour varies across platforms such that writing a solid test would either be infeasible or test so little that it does not seem to make sense to keep it. Reviewed-By: Colin Ihrig <cjihrig@gmail.com> PR-URL: https://github.com/joyent/node/pull/25326
* | Now working on 0.12.4Julien Gilli2015-05-131-2/+2
| |
* | Merge branch 'v0.12.3-release' into v0.12Julien Gilli2015-05-133-2/+28
|\ \
| * | 2015.05.13, Version 0.12.3 (Stable)v0.12.3v0.12.3-releaseJulien Gilli2015-05-133-2/+28
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * V8: update to 3.28.71.19 * uv: upgrade to 1.5.0 * npm: upgrade to 2.9.1 * V8: don't busy loop in v8 cpu profiler thread (Mike Tunnicliffe) * V8: fix issue with let bindings in for loops (adamk) * debugger: don't spawn child process in remote mode (Jackson Tian) * net: do not set V4MAPPED on FreeBSD (Julien Gilli) * repl: make 'Unexpected token' errors recoverable (Julien Gilli) * src: backport ignore ENOTCONN on shutdown race (Ben Noordhuis) * src: fix backport of SIGINT crash fix on FreeBSD (Julien Gilli)
View Lorry Controller Status