Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge v2.3.1 into next #2060

Merged
merged 22 commits into from
Jun 25, 2015
Merged

Conversation

bnoordhuis
Copy link
Member

Trott and others added 21 commits June 16, 2015 17:19
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 <[email protected]>
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Futher discussion at nodejs/node-v0.x-archive#25294

PR-URL: nodejs#1926
Reviewed-By: Rod Vagg <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
The accessors run inside an implicit HandleScope, there is no need to
create a new one.

PR-URL: nodejs#2001
Reviewed-By: Trevor Norris <[email protected]>
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 <[email protected]>
PR-URL: nodejs#1943
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Rod Vagg <[email protected]>
Reviewed-By: Jeremiah Senkpiel <[email protected]>
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 <[email protected]>
Reviewed-By: Fedor Indutny <[email protected]>
require() now checks that the path exists before searching
further in it.

PR-URL: nodejs#1920
Reviewed-By: Isaac Z. Schlueter <[email protected]>
Reviewed-By: Trevor Norris <[email protected]>
Reviewed-By: Chris Dickinson <[email protected]>
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Add link to Jenkins server in Collaborator Guide.

PR-URL: nodejs#1995
Reviewed-By: Chris Dickinson <[email protected]>
Reviewed-By: Jeremiah Senkpiel <[email protected]>
PR-URL: nodejs#2000
Reviewed-By: Yosuke Furukawa <[email protected]>
Reviewed-By: Evan Lucas <[email protected]>
Reviewed-By: Johan Bergström <[email protected]>
PR-URL: nodejs#2004
Reviewed-By: Rod Vagg <[email protected]>
Reviewed-By: Alexis Campailla <[email protected]>
PR-URL: nodejs#2018
Reviewed-By: Jeremiah Senkpiel <[email protected]>
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 <[email protected]>
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 <[email protected]>
PR-URL: nodejs#1948
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Johan Bergström <[email protected]>
Reviewed-By: Jeremiah Senkpiel <[email protected]>
PR-URL: nodejs#2014
Reviewed-By: Rod Vagg <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
PR-URL: nodejs#2013
Reviewed-By: Rod Vagg <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
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 mscdex added the meta Issues and PRs related to the general management of the project. label Jun 25, 2015
@cjihrig
Copy link
Contributor

cjihrig commented Jun 25, 2015

LGTM

@bnoordhuis
Copy link
Member Author

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 bnoordhuis merged commit 6e72ac7 into nodejs:next Jun 25, 2015
@bnoordhuis bnoordhuis deleted the merge-v2.3.1-into-next branch June 25, 2015 17:25
@bnoordhuis
Copy link
Member Author

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
Labels
meta Issues and PRs related to the general management of the project.
Projects
None yet
Development

Successfully merging this pull request may close these issues.