Simplify state transitions in http.Client

Fixes new bug shown in test-http-allow-req-after-204-res.js pointed out by
Tom Carden <tom.carden@gmail.com>.

1 files changed, 21 insertions, 11 deletions

diff --git a/lib/http.js b/lib/http.js
index 883ab088ca6..89e2d81a098 100644
--- a/lib/http.js
+++ b/lib/http.js
@@ -880,6 +880,12 @@ function Client ( ) {
   net.Stream.call(this, { allowHalfOpen: true });
   var self = this;
 
+  // Possible states:
+  // - disconnected
+  // - connecting
+  // - connected
+  this._state = 'disconnected';
+
   httpSocketSetup(self);
 
   function onData(d, start, end) {
@@ -912,6 +918,8 @@ function Client ( ) {
     self.ondata = onData;
     self.onend = onEnd;
 
+    self._state = "connected";
+
     self._initParser();
     debug('CLIENT requests: ' + util.inspect(self._outgoing.map(function (r) { return r.method; })));
     outgoingFlush(self);
@@ -919,21 +927,22 @@ function Client ( ) {
 
   function onEnd() {
     if (self.parser) self.parser.finish();
-    debug("CLIENT got end closing. readyState = " + self.readyState);
+    debug("CLIENT got end closing. state = " + self._state);
     self.end();
   };
 
   self.addListener("close", function (e) {
+    self._state = "disconnected";
     if (e) return;
 
-    debug("CLIENT onClose. readyState = " + self.readyState);
+    debug("CLIENT onClose. state = " + self._state);
 
     // finally done with the request
     self._outgoing.shift();
 
     // If there are more requests to handle, reconnect.
     if (self._outgoing.length) {
-      self._reconnect();
+      self._ensureConnection();
     } else if (self.parser) {
       parsers.free(self.parser);
       self.parser = null;
@@ -982,7 +991,7 @@ Client.prototype._initParser = function () {
     }
 
     res.addListener('end', function ( ) {
-      debug("CLIENT request complete disconnecting. readyState = " + self.readyState);
+      debug("CLIENT request complete disconnecting. state = " + self._state);
       // For the moment we reconnect for every request. FIXME!
       // All that should be required for keep-alive is to not reconnect,
       // but outgoingFlush instead.
@@ -1020,17 +1029,18 @@ Client.prototype._onOutgoingSent = function (message) {
   //
   // Instead, we just check if the connection is closed, and if so
   // reconnect if we have pending messages.
-  if (this._outgoing.length && this.readyState == "closed") {
-    debug("CLIENT request flush. reconnect.  readyState = " + this.readyState);
-    this._reconnect();
+  if (this._outgoing.length) {
+    debug("CLIENT request flush. ensure connection.  state = " + this._state);
+    this._ensureConnection();
   }
 };
 
 
-Client.prototype._reconnect = function () {
-  if (this.readyState === "closed") {
-    debug("CLIENT reconnecting readyState = " + this.readyState);
+Client.prototype._ensureConnection = function () {
+  if (this._state == 'disconnected') {
+    debug("CLIENT reconnecting state = " + this._state);
     this.connect(this.port, this.host);
+    this._state = "connecting";
   }
 };
 
@@ -1044,7 +1054,7 @@ Client.prototype.request = function (method, url, headers) {
   }
   var req = new ClientRequest(this, method, url, headers);
   this._outgoing.push(req);
-  if (this.readyState === 'closed') this._reconnect();
+  this._ensureConnection();
   return req;
 };