diff --git a/CHANGELOG.md b/CHANGELOG.md index 29bf5be559d75d..e915dabd6f8ea6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,8 @@ release. -9.6.0
+9.6.1
+9.6.0
9.5.0
9.4.0
9.3.0
diff --git a/doc/changelogs/CHANGELOG_V9.md b/doc/changelogs/CHANGELOG_V9.md index 1641a651898fd6..a95c79634dbee3 100644 --- a/doc/changelogs/CHANGELOG_V9.md +++ b/doc/changelogs/CHANGELOG_V9.md @@ -8,6 +8,7 @@ +9.6.1
9.6.0
9.5.0
9.4.0
@@ -31,6 +32,20 @@ * [io.js](CHANGELOG_IOJS.md) * [Archive](CHANGELOG_ARCHIVE.md) + +## 2018-02-22, Version 9.6.1 (Current), @MylesBorins + +This is a special release to fix potentially Semver-Major regression that was released in v9.6.0 + +### Notable Changes + +* **events**: + - `events.usingDomains` being set to `false` by default was removed in 9.6.0 which was a change in behavior compares to 9.5.0. This behavior change has been reverted and the `events` object now has `usingDomains` preset to `false`, which is the behavior in 9.x prior to 9.6.0 (Myles Borins) [#18944](https://github.com/nodejs/node/pull/18944) + +### Commits + +* [[`761caec379`](https://github.com/nodejs/node/commit/761caec379)] - **events**: preset `usingDomains` to false (Myles Borins) [#18944](https://github.com/nodejs/node/pull/18944) + ## 2018-02-22, Version 9.6.0 (Current), @MylesBorins diff --git a/lib/events.js b/lib/events.js index dda33758dbda55..07fa6484363116 100644 --- a/lib/events.js +++ b/lib/events.js @@ -31,6 +31,8 @@ module.exports = EventEmitter; // Backwards-compat with node 0.10.x EventEmitter.EventEmitter = EventEmitter; +EventEmitter.usingDomains = false; + EventEmitter.prototype._events = undefined; EventEmitter.prototype._eventsCount = 0; EventEmitter.prototype._maxListeners = undefined; diff --git a/src/node_version.h b/src/node_version.h index 1df51f5036c39c..e05db68691fee0 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -29,7 +29,7 @@ #define NODE_VERSION_IS_LTS 0 #define NODE_VERSION_LTS_CODENAME "" -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_STRINGIFY #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n) diff --git a/test/parallel/test-event-emitter-subclass.js b/test/parallel/test-event-emitter-subclass.js index 5189c3aa13422f..094565197bd740 100644 --- a/test/parallel/test-event-emitter-subclass.js +++ b/test/parallel/test-event-emitter-subclass.js @@ -36,6 +36,7 @@ function MyEE(cb) { const myee = new MyEE(common.mustCall()); +myee.hasOwnProperty('usingDomains'); util.inherits(ErrorEE, EventEmitter); function ErrorEE() {