From 8bf0c15a5b21755c4c66b54f5aad16e81a416c13 Mon Sep 17 00:00:00 2001
From: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Date: Tue, 18 Dec 2012 10:59:07 +0900
Subject: [PATCH] stream2: fix to emit end event on http.ClientResponse

---
 lib/http.js                                   |  5 ++
 .../test-stream2-httpclient-response-end.js   | 52 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 test/simple/test-stream2-httpclient-response-end.js

diff --git a/lib/http.js b/lib/http.js
index 43c61b5e43..5013f3c0a3 100644
--- a/lib/http.js
+++ b/lib/http.js
@@ -160,6 +160,11 @@ function parserOnMessageComplete() {
       stream._readableState.onread(null, null);
   }
 
+  if (!stream._readableState.endEmitted && !parser.incoming._pendings.length) {
+    // For emit end event
+    stream._readableState.onread(null, null);
+  }
+
   if (parser.socket.readable) {
     // force to read the next incoming message
     parser.socket.resume();
diff --git a/test/simple/test-stream2-httpclient-response-end.js b/test/simple/test-stream2-httpclient-response-end.js
new file mode 100644
index 0000000000..15cffc2ac9
--- /dev/null
+++ b/test/simple/test-stream2-httpclient-response-end.js
@@ -0,0 +1,52 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common.js');
+var assert = require('assert');
+var http = require('http');
+var msg = 'Hello';
+var readable_event = false;
+var end_event = false;
+var server = http.createServer(function(req, res) {
+  res.writeHead(200, {'Content-Type': 'text/plain'});
+  res.end(msg);
+}).listen(common.PORT, function() {
+  http.get({port: common.PORT}, function(res) {
+    var data = '';
+    res.on('readable', function() {
+      console.log('readable event');
+      readable_event = true;
+      data += res.read();
+    });
+    res.on('end', function() {
+      console.log('end event');
+      end_event = true;
+      assert.strictEqual(msg, data);
+      server.close();
+    });
+  });
+});
+
+process.on('exit', function() {
+  assert(readable_event);
+  assert(end_event);
+});
+