Merge v2.3.1 into next #2060
Merged
Merge v2.3.1 into next #2060
+1,513
−526
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tmpdir creation only happens for tests that need it. So failure to refresh the temporary directory should result in a failed test. PR-URL: nodejs#1976 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Futher discussion at nodejs/node-v0.x-archive#25294 PR-URL: nodejs#1926 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
The accessors run inside an implicit HandleScope, there is no need to create a new one. PR-URL: nodejs#2001 Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Re-add the wrapper class id to AsyncWrap instances so they can be tracked directly in a heapdump. Previously the class id was given without setting the heap dump wrapper class info provider. Causing a segfault when a heapdump was taken. This has been added, and the label_ set to the given provider name so each instance can be identified. The id will not be set of the passed object has no internal field count. As the class pointer cannot be retrieved from the object. In order to properly report the allocated size of each class, the new pure virtual method self_size() has been introduces. PR-URL: nodejs#1896 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: nodejs#1989 Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#1943 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
PR-URL: nodejs#1994 Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Defer reading until user-land has a chance to add listeners. This allows the TLS wrapper to listen for _tlsError and trigger a clientError event if the socket already has data that could trigger. Fixes: nodejs#1114 PR-URL: nodejs#1496 Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com> Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
require() now checks that the path exists before searching further in it. PR-URL: nodejs#1920 Reviewed-By: Isaac Z. Schlueter <i@izs.me> Reviewed-By: Trevor Norris <trev.norris@gmail.com> Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Add link to Jenkins server in Collaborator Guide. PR-URL: nodejs#1995 Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
PR-URL: nodejs#2000 Reviewed-By: Yosuke Furukawa <yosuke.furukawa@gmail.com> Reviewed-By: Evan Lucas <evanlucas@me.com> Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
PR-URL: nodejs#2004 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
PR-URL: nodejs#2018 Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Every npm version bump requires a few patches to be floated on node-gyp for io.js compatibility. These patches are found in 03d1992, 5de334c, and da730c7. This commit squashes them into a single commit. PR-URL: nodejs#990 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
The delay-load hook allows node.exe/iojs.exe to be renamed. See efadffe for more background. PR-URL: nodejs#1433 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: nodejs#1948 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Johan Bergström <bugs@bergstroem.nu> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
PR-URL: nodejs#2007 Reviewed-By: Rod Vagg <rod@vagg.org>
PR-URL: nodejs#2014 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: nodejs#2013 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: nodejs#2015 Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#1996 Notable changes * module: The number of syscalls made during a require() have been significantly reduced again (see nodejs#1801 from v2.2.0 for previous work), which should lead to a performance improvement (Pierre Inglebert) nodejs#1920. * npm: - Upgrade to v2.11.2 (Rebecca Turner) nodejs#1956. - Upgrade to v2.11.3 (Forrest L Norvell) nodejs#2018. * zlib: A bug was discovered where the process would abort if the final part of a zlib decompression results in a buffer that would exceed the maximum length of 0x3fffffff bytes (~1GiB). This was likely to only occur during buffered decompression (rather than streaming). This is now fixed and will instead result in a thrown RangeError (Michaël Zasso) nodejs#1811.
mscdex
added
the
meta
|
LGTM |
PR-URL: nodejs#2060 Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
|
I'm doing another run on the Windows buildbots, there's a win2008 failure that I'm almost certain is a fluke: https://jenkins-iojs.nodesource.com/job/iojs+pr+win/70/ EDIT: It's the same test as mentioned here, parallel/test-timers-first-fire. |
bnoordhuis
force-pushed
the
merge-v2.3.1-into-next
branch
from
b363d5a
to
6e72ac7
Compare
|
Second run was successful. Landed in 6e72ac7, thanks for reviewing. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
R=@rvagg?
CI: https://jenkins-iojs.nodesource.com/job/iojs+any-pr+multi/82/