Fix ondrain. Kind of working.

wankdanker · Nov 30, 2010 · 19264c1 · 19264c1
1 parent a261a24
commit 19264c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/http.js b/lib/http.js
@@ -836,8 +836,8 @@ function connectionListener (socket) {
       // No more messages to be pushed out.
 
       // HACK: need way to do this with socket interface
-      if (socket._writeQueue.length) {
-        socket.__destroyOnDrain = true; //socket.end();
+      if (socket._writeWatcher.firstBucket) {
+        socket._eof = true;
       } else {
         socket.destroy();
       }

diff --git a/lib/net.js b/lib/net.js
@@ -62,7 +62,7 @@ IOWatcher.prototype.ondrain = function () {
     this.socket.emit('drain');
   }
 
-  if (this.writable && this.socket._eof) this.socket._shutdown();
+  if (this.socket._eof) this.socket._shutdown();
 };