V6.9.1 proposal

CHANGELOG.md

@@ -26,7 +26,9 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V6.md#6.8.1">6.8.1</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V6.md#6.9.1">6.9.1</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V6.md#6.9.0">6.9.0</a><br/>
+<a href="doc/changelogs/CHANGELOG_V6.md#6.8.1">6.8.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.8.0">6.8.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.7.0">6.7.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.6.0">6.6.0</a><br/>

doc/changelogs/CHANGELOG_V6.md

@@ -7,9 +7,10 @@
 </tr>
 <tr>
 <td valign="top">
-<a href="#6.9.0">6.9.0</a><br/>
+<a href="#6.9.1">6.9.1</a><br/>
 </td>
 <td valign="top">
+<a href="#6.9.0">6.9.0</a><br/>
 <a href="#6.8.1">6.8.1</a><br/>
 <a href="#6.8.0">6.8.0</a><br/>
 <a href="#6.7.0">6.7.0</a><br/>
@@ -39,7 +40,23 @@
 [Node.js Long Term Support Plan](https://github.com/nodejs/LTS) and
 will be supported actively until April 2018 and maintained until April 2019.
 
-<a id="6.8.1"></a>
+<a id="6.9.1"></a>
+## 2016-10-19, Version 6.9.1 'Boron' (LTS), @thealphanerd
+
+### Notable changes
+
+* **streams**: Fix a regression introduced in v6.8.0 in readable stream that caused unpipe to remove the wrong stream (Anna Henningsen)
+
+### Commits
+
+* [[`2c3bbb576c`](https://github.com/nodejs/node/commit/2c3bbb576c)] - **doc**: fix changelog index for v6.9.0 (Rod Vagg) [#9168](https://github.com/nodejs/node/pull/9168)
+* [[`f4b766f5b7`](https://github.com/nodejs/node/commit/f4b766f5b7)] - **streams**: fix regression in `unpipe()` (Anna Henningsen) [#9171](https://github.com/nodejs/node/pull/9171)
+* [[`6072326009`](https://github.com/nodejs/node/commit/6072326009)] - **test**: add regression test for `unpipe()` (Niels Nielsen) [#9171](https://github.com/nodejs/node/pull/9171)
+* [[`9f248a4d83`](https://github.com/nodejs/node/commit/9f248a4d83)] - **tools**: check tag is on github before release (Rod Vagg) [#9142](https://github.com/nodejs/node/pull/9142)
+* [[`c74d3a700a`](https://github.com/nodejs/node/commit/c74d3a700a)] - **tools**: make detached SHASUM .sig file for releases (Rod Vagg) [#9071](https://github.com/nodejs/node/pull/9071)
+* [[`955bbf876f`](https://github.com/nodejs/node/commit/955bbf876f)] - **tools**: explicitly set digest algo for SHASUM to 256 (Rod Vagg) [#9071](https://github.com/nodejs/node/pull/9071)
+
+<a id="6.9.0"></a>
 ## 2016-10-18, Version 6.9.0 'Boron' (LTS), @rvagg
 
 This release marks the transition of Node.js v6 into Long Term Support (LTS) with the codename 'Boron'. The v6 release line now moves in to "Active LTS" and will remain so until April 2018. After that time it will move in to "Maintenance" until end of life in April 2019.

lib/_stream_readable.js

@@ -671,7 +671,7 @@ Readable.prototype.unpipe = function(dest) {
   if (index === -1)
     return this;
 
-  state.pipes.splice(i, 1);
+  state.pipes.splice(index, 1);
   state.pipesCount -= 1;
   if (state.pipesCount === 1)
     state.pipes = state.pipes[0];

src/node_version.h

@@ -8,7 +8,7 @@
 #define NODE_VERSION_IS_LTS 1
 #define NODE_VERSION_LTS_CODENAME "Boron"
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)

test/parallel/test-stream-pipe-unpipe-streams.js

@@ -0,0 +1,30 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+
+const { Readable, Writable } = require('stream');
+
+const source = Readable({read: () => {}});
+const dest1 = Writable({write: () => {}});
+const dest2 = Writable({write: () => {}});
+
+source.pipe(dest1);
+source.pipe(dest2);
+
+dest1.on('unpipe', common.mustCall(() => {}));
+dest2.on('unpipe', common.mustCall(() => {}));
+
+assert.strictEqual(source._readableState.pipes[0], dest1);
+assert.strictEqual(source._readableState.pipes[1], dest2);
+assert.strictEqual(source._readableState.pipes.length, 2);
+
+// Should be able to unpipe them in the reverse order that they were piped.
+
+source.unpipe(dest2);
+
+assert.strictEqual(source._readableState.pipes, dest1);
+assert.notStrictEqual(source._readableState.pipes, dest2);
+
+source.unpipe(dest1);
+
+assert.strictEqual(source._readableState.pipes, null);

tools/release.sh

@@ -78,6 +78,14 @@ function sign {
 
   if [ "${gpgtagkey}" != "${gpgkey}" ]; then
     echo "GPG key for \"${version}\" tag is not yours, cannot sign"
+    exit 1
+  fi
+
+  ghtaggedversion=$(curl -sL https://raw.githubusercontent.com/nodejs/node/${version}/src/node_version.h \
+      | awk '/define NODE_(MAJOR|MINOR|PATCH)_VERSION/{ v = v "." $3 } END{ v = "v" substr(v, 2); print v }')
+  if [ "${version}" != "${ghtaggedversion}" ]; then
+    echo "Could not find tagged version on github.com/nodejs/node, did you push your tag?"
+    exit 1
   fi
 
   shapath=$(ssh ${webuser}@${webhost} $signcmd nodejs $version)
@@ -97,7 +105,8 @@ function sign {
 
   scp ${webuser}@${webhost}:${shapath} ${tmpdir}/${shafile}
 
-  gpg --default-key $gpgkey --clearsign ${tmpdir}/${shafile}
+  gpg --default-key $gpgkey --clearsign --digest-algo SHA256 ${tmpdir}/${shafile}
+  gpg --default-key $gpgkey --detach-sign --digest-algo SHA256 ${tmpdir}/${shafile}
 
   echo "Wrote to ${tmpdir}/"
 
@@ -117,7 +126,7 @@ function sign {
     fi
 
     if [ "X${yorn}" == "Xy" ]; then
-      scp ${tmpdir}/${shafile} ${tmpdir}/${shafile}.asc ${webuser}@${webhost}:${shadir}/
+      scp ${tmpdir}/${shafile} ${tmpdir}/${shafile}.asc ${tmpdir}/${shafile}.sig ${webuser}@${webhost}:${shadir}/
       break
     fi
   done