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,696 Commits 266 Branches 972 Tags
cf435d55db1900b996e069738673ce1ed4cee180
Commit Graph
10696 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexis Campailla cf435d55db test: mark test-signal-unregister as flaky 
This test just failed on Ubuntu in Jenkins, for a change that
is 100% Windows-specific.

Reviewed-By: Joao Reis <reis@janeasystems.com>
PR-URL: https://github.com/joyent/node/pull/25750
 2015-07-24 02:04:43 -07:00
João Reis ceb6a8c131 test: fix test-debug-port-from-cmdline 
This change is a backport of 2b4b600660
from io.js.

Original commit message:

  This test was failing because the spawned process was terminated
  before anything could be done, by calling child.stdin.end. With this
  change, the child's stdin is no longer closed. When the stdin is not
  a tty, io.js waits for the whole input before starting, so the child
  must be run with --interactive to process the command sent by the
  parent. The child is killed explicitly by the parent before it exits.

  This test was failing silently because the asserts were not called if
  nothing was received from the child. This fix moves assertOutputLines
  to always run on exit.

  Fixes: https://github.com/nodejs/io.js/issues/2177
  Refs: https://github.com/nodejs/io.js/issues/2094
  PR-URL: https://github.com/nodejs/io.js/pull/2186
  Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  Reviewed-By: Rod Vagg <rod@vagg.org>
  Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
  Reviewed-By: Alexis Campailla <alexis@janeasystems.com>

Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
PR-URL: https://github.com/joyent/node/pull/25748
 2015-07-23 08:18:33 -07:00
João Reis 14db629497 win,msi: correct installation path registry keys 
Since install is per machine only, installation path should be stored
in local machine instead of current user. The registry stores HKLM in
different places for 32 and 64 bit applications, so the installer will
not suggest the old path when upgrading from 32 to 64 bit version.

Fixes #5592
Fixes #25087

PR-URL: https://github.com/joyent/node/pull/25640
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
Reviewed-By: Bert Belder <bertbelder@gmail.com>
 2015-07-22 09:30:11 -04:00
João Reis 8e80528453 win,msi: change InstallScope to perMachine 
The MSI install scope was set to the WiX default, which is per-user.
However, with UAC, it could not be installed by a standard user because
InstallPrivileges is elevated by default, hence the install scope
should be set to per-machine. Furthermore, the default install path is
a per-machine location and setting the system path requires
administrator privileges.

By changing the InstallScope to perMachine, Start Menu shortcuts are
placed in ProgramData and not the installing user's AppData folder,
making the shortcuts available to other users. This also fixes the
installation when AppData is a network folder.

The custom action is necessary to allow upgrades. Since a per-machine
MSI cannot upgrade an application installed per-user, the custom action
checks if there is going to be an upgrade to a previous version
installed per-user and sets the installation as per-user to allow
upgrading. Hence, the advantages of installing per-machine will only
apply in fresh installations.

Fixes #5849
Fixes #7629

PR-URL: https://github.com/joyent/node/pull/25640
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
Reviewed-By: Bert Belder <bertbelder@gmail.com>
 2015-07-22 09:30:11 -04:00
Fedor Indutny b8d47a7b6f fix 
Reviewed-By: Fedor Indutny <fedor@indutny.com>
PR-URL: https://github.com/joyent/node/pull/25739
 2015-07-20 11:47:07 -07:00
Fedor Indutny 22997731e6 test: add regression test for #25735 
See: https://github.com/joyent/node/issues/25736

Reviewed-By: Fedor Indutny <fedor@indutny.com>
PR-URL: https://github.com/joyent/node/pull/25739
 2015-07-20 11:47:06 -07:00
Fedor Indutny 75697112e8 tls: do not hang without newSession handler 
When listening for client hello parser events (like OCSP requests), do
not hang if `newSession` event handler is not present.

Fix: https://github.com/joyent/node/issues/8660
Fix: https://github.com/joyent/node/issues/25735

Reviewed-By: Fedor Indutny <fedor@indutny.com>
PR-URL: https://github.com/joyent/node/pull/25739
 2015-07-20 11:47:06 -07:00
Julien Gilli 39e05639f4 test: mark http-pipeline-flood flaky on win32 
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25707
 2015-07-17 11:46:04 -07:00
cgalibern 8b81f98c41 configure: add --without-mdb flag 
Add a configuration flag that prevents mdb_v8.so from being built.
The default behavior is still the same and mdb_v8.so is built by default
on Solaris based platforms such as SmartOS.

Using --without-mdb fixes build issues on Solaris based platforms where
libproc.h is not available or not compatible with the one shipped by
SmartOS.

Fixes #6439.

Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25707
 2015-07-17 11:46:03 -07:00
João Reis 78d256e7f5 test: unmark tests that are no longer flaky 
- `test-crypto-domains` was fixed by
joyent/node@2afa3d8a03

- All tests under linux appear to be fixed and have not failed recently
on Jenkins

- `test-http-dns-fail` was fixed by the DNS configuration change
mentioned in joyent/node#8056

Fixes #25656
Fixes #25673

Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
PR-URL: https://github.com/joyent/node/pull/25676
 2015-07-16 02:10:08 -07:00
Alexis Campailla 1083fa70f0 build: run-ci makefile rule 
Adding a single rule to be called from Jenkins.

Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25653
 2015-07-10 10:06:25 -07:00
Alexis Campailla a9b642cf5b test: runner should return 0 on flaky tests 
Make the test runner return a 0 exit code when only
flaky tests fail and --flaky-tests=dontcare is specified.

Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25653
 2015-07-10 10:06:24 -07:00
Alexis Campailla 2d2494cf14 build: support flaky tests in test-ci 
Adding support for specifying flaky test mode to
the test runner:
- via an environment variable FLAKY_TESTS for Makefile
- via an argument ignore-flaky for vcbuild.bat

Conflicts:
	Makefile

Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25653
 2015-07-10 10:06:24 -07:00
Alexis Campailla b25d26f2ef build: support Jenkins via test-ci 
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25653
 2015-07-10 10:06:24 -07:00
Johan Bergström d998a65058 tools: pass constant to logger instead of string 
On a few of our installations (namely CentOS), passing 'INFO'
resulted in a silent loglevel. Use a logging constant instead.

Cherry-picked from https://github.com/nodejs/io.js/commit/8606793999979829df002c2ab69235a05605fc4d
Original commit metadata follows:
  Fixes: https://github.com/nodejs/build/issues/104
  PR-URL: https://github.com/nodejs/io.js/pull/1842
  Reviewed-By: Rod Vagg <rod@vagg.org>

Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25653
 2015-07-10 10:06:21 -07:00
Alexis Campailla b48639befd test: support writing test output to file 
This is a minimal effort to support test output written both to
stdout and file in order to get our buildbots understanding
test output.

Cherry picked from https://github.com/jbergstroem/io.js/commit/31940738e2d256e91c1c694c5219b8f840c629ff
Original commit message follows:
  PR-URL: https://github.com/iojs/io.js/pull/934
  Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com>
  Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

Conflicts:
	tools/test.py

Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
PR-URL: https://github.com/joyent/node/pull/25653
 2015-07-10 10:06:19 -07:00
Julien Gilli b8ac6584fa Now working on 0.12.8 2015-07-09 16:52:08 -07:00
Julien Gilli bd68784dee Merge branch 'v0.12.7-release' into v0.12 2015-07-09 16:51:47 -07:00
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