Merge branch 'v0.4'

Conflicts:
	src/node_version.h

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/http.js b/lib/http.js
index acb8898215f..c18a8683df9 100644
--- a/lib/http.js
+++ b/lib/http.js
@@ -1089,7 +1089,11 @@ function connectionListener(socket) {
     // When we're finished writing the response, check if this is the last
     // respose, if so destroy the socket.
     res.on('finish', function() {
-      assert(incoming[0] === req);
+      // Usually the first incoming element should be our request.  it may
+      // be that in the case abortIncoming() was called that the incoming
+      // array will be empty.
+      assert(incoming.length == 0 || incoming[0] === req);
+
       incoming.shift();
 
       res.detachSocket(socket);