Merge remote-tracking branch 'ry/v0.8' into master

Conflicts:
	AUTHORS
	ChangeLog
	src/node_version.h
	test/simple/test-buffer.js

1 files changed, 18 insertions, 1 deletions

diff --git a/lib/http.js b/lib/http.js
index 417b3c9d20..c8bec11212 100644
--- a/lib/http.js
+++ b/lib/http.js
@@ -970,7 +970,24 @@ exports.ServerResponse = ServerResponse;
 ServerResponse.prototype.statusCode = 200;
 
 function onServerResponseClose() {
-  this._httpMessage.emit('close');
+  // EventEmitter.emit makes a copy of the 'close' listeners array before
+  // calling the listeners. detachSocket() unregisters onServerResponseClose
+  // but if detachSocket() is called, directly or indirectly, by a 'close'
+  // listener, onServerResponseClose is still in that copy of the listeners
+  // array. That is, in the example below, b still gets called even though
+  // it's been removed by a:
+  //
+  //   var obj = new events.EventEmitter;
+  //   obj.on('event', a);
+  //   obj.on('event', b);
+  //   function a() { obj.removeListener('event', b) }
+  //   function b() { throw "BAM!" }
+  //   obj.emit('event');  // throws
+  //
+  // Ergo, we need to deal with stale 'close' events and handle the case
+  // where the ServerResponse object has already been deconstructed.
+  // Fortunately, that requires only a single if check. :-)
+  if (this._httpMessage) this._httpMessage.emit('close');
 }
 
 ServerResponse.prototype.assignSocket = function(socket) {