The original change that added support for running custom actions during
the install process (e7c84f82

) assumed
that Visual Studio 2013 is used to generate the installer file.

However, that is not always the case, and older versions of Visual
Studio should allow users to generate Windows installer files. This
change makes the custom actions visual studio project use the visual
studio version that is found by vcbuild.bat.

Reviewed-By: João Reis <reis@janeasystems.com>
PR-URL: https://github.com/joyent/node/pull/25569

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 31220528, which itself
backports e8d08503 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 e8d08503

)

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



Conflicts:
	node.gyp

Reviewed-By: João Reis <reis@janeasystems.com>
PR-URL: https://github.com/joyent/node/pull/25569

Backport commit a58b1745

 from branch
v0.12.

Original commit message:

  vcbuild.bat calls python configure before setting GYP_MSVS_VERSION,
  so SelectVisualStudioVersion (tools\gyp\pylib\gyp\MSVSVersion.py)
  defaults to 'auto' and selects VS 2005.

  vcbuild sets the environment in the current shell, so this issue
  would manifest itself only on the first invocation of the script
  in any given shell windows.

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



Conflicts:
	vcbuild.bat

Reviewed-By: João Reis <reis@janeasystems.com>
PR-URL: https://github.com/joyent/node/pull/25569

It seems that test-net-error-twice.js does not behave as expected. Its
goal is to test fireErrorCallbacks, but it doesn't do it correctly,
leading to false negatives on some platforms and failures on others.
This change marks this test as flaky so that we can use our CI to land
changes in the v0.10 branch until we can fix it properly.

See the corresponding issue at
https://github.com/joyent/node/issues/9325 for more details.

PR: #25760
PR-URL: https://github.com/joyent/node/pull/25760


Reviewed-By: João Reis <reis@janeasystems.com>

Before this change, test/simple/test-abort-fatal-error.js would fail in
some environments for reasons I wasn't able to fully understand. It was
marked as flaky on some systems, but not on others on which it was
failing sometimes (OSX).

This change basically syncs test-abort-fatal-error with how it's
implemented in v0.12. It back ports 429b5870 (or rather the parts that
apply to it since it's a merge commit), 2f5e77f5 and 114bff46.

After backporting these changes in v0.10, test-abort-fatal-error is not
flaky anymore in environments for which it was flaky. It also has the
added benefit of being more robust because it checks exit codes and
signals instead of error messages.

Tested on OSX and SmartOS, the only platforms on which I could reproduce
the flakiness of this test.

This change also removes test-abort-fatal-error from the list of flaky
tests in test/simple/simple.status.

Fixes #25720.

PR: #25755
PR-URL: https://github.com/joyent/node/pull/25755


Reviewed-By: João Reis <reis@janeasystems.com>

PR-URL: https://github.com/joyent/node/pull/25686


Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

Adding a single rule to be called from Jenkins.

PR-URL: https://github.com/joyent/node/pull/25686


Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

Make the test runner return a 0 exit code when only
flaky tests fail and --flaky-tests=dontcare is specified.

PR-URL: https://github.com/joyent/node/pull/25686


Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

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

PR-URL: https://github.com/joyent/node/pull/25686


Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

PR-URL: https://github.com/joyent/node/pull/25686


Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

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>

PR-URL: https://github.com/joyent/node/pull/25686


Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

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

Conflicts:
	tools/test.py

PR-URL: https://github.com/joyent/node/pull/25686


Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

Adding --flaky-tests option, to allow regarding flaky tests failures
as non-fatal.

Currently only observed by the TapProgressIndicator, which will
add a # TODO directive to tests classified as flaky. According to the
TAP specification, the test harness is supposed to treat failures
that have a # TODO directive as non-fatal.

PR-URL: https://github.com/joyent/node/pull/25686


Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

PR-URL: https://github.com/joyent/node/pull/25686


Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

test.py imports deps/v8/tools/utils.py but that file is gone after the
upgrade to 3.18.4 in commit 2f75785c. Resurrect the file in tools/

PR-URL: https://github.com/joyent/node/pull/25686


Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

Use staging area on nodejs.org instead of TJ's account. Also pushes
release tag and branch to personal forks rather than joyent/node, which
makes errors have less impact.

Pushing release tags and branches is left as a manual step for the
release managers, when they decide the timing is best.

PR: #25638
PR-URL: https://github.com/joyent/node/pull/25638


Reviewed-By: Sam Roberts <sam@strongloop.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

* 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)

reapply b9106137

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>

`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>

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>

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>

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>

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>

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

Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
PR-URL: https://github.com/joyent/node/pull/25588

* 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)

This reverts commit 67d9a562.

This commit actually reverts both
67d9a562 and
02a549ed (both related to ciphers list
changes). It does it in one commit because reverting
02a549ed 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>

reapply b9106137

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>

`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>

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>

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>

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>

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>

Backport 668bde8a 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 668bde8a)

--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

This is needed so that we can backport
668bde8a 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

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>