stream: Emit readable on ended streams via read(0)

cc: @mjijackson

diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index 2f4d8a4..e30a327 100644 (file)
--- a/lib/_stream_readable.js
+++ b/lib/_stream_readable.js
@@ -236,7 +236,7 @@ Readable.prototype.read = function(n) {
   // the 'readable' event and move on.
   if (n === 0 &&
       state.needReadable &&
-      state.length >= state.highWaterMark) {
+      (state.length >= state.highWaterMark || state.ended)) {
     emitReadable(this);
     return null;
   }

diff --git a/test/simple/test-stream-readable-event.js b/test/simple/test-stream-readable-event.js
index be17f04..fdbcb48 100644 (file)
--- a/test/simple/test-stream-readable-event.js
+++ b/test/simple/test-stream-readable-event.js
@@ -80,3 +80,27 @@ var Readable = require('stream').Readable;
     console.log('ok 2');
   });
 })();
+
+(function third() {
+  // Third test, not reading when the stream has not passed
+  // the highWaterMark but *has* reached EOF.
+  var r = new Readable({
+    highWaterMark: 30
+  });
+
+  // This triggers a 'readable' event, which is lost.
+  r.push(new Buffer('blerg'));
+  r.push(null);
+
+  var caughtReadable = false;
+  setTimeout(function() {
+    r.on('readable', function() {
+      caughtReadable = true;
+    });
+  });
+
+  process.on('exit', function() {
+    assert(caughtReadable);
+    console.log('ok 3');
+  });
+})();