Fix another self mention.

Fixes #171

index.js

@@ -147,10 +147,8 @@ RedirectableRequest.prototype.removeHeader = function (name) {
 // Global timeout for all underlying requests
 RedirectableRequest.prototype.setTimeout = function (msecs, callback) {
  var self = this;
- if (callback) {
- this.on("timeout", callback);
- }
 
+ // Destroys the socket on timeout
  function destroyOnTimeout(socket) {
  socket.setTimeout(msecs);
  socket.removeListener("timeout", socket.destroy);
@@ -169,25 +167,34 @@ RedirectableRequest.prototype.setTimeout = function (msecs, callback) {
  destroyOnTimeout(socket);
  }
 
- // Prevent a timeout from triggering
+ // Stops a timeout from triggering
  function clearTimer() {
- clearTimeout(self._timeout);
+ if (self._timeout) {
+ clearTimeout(self._timeout);
+ self._timeout = null;
+ }
  if (callback) {
  self.removeListener("timeout", callback);
  }
- if (!this.socket) {
+ if (!self.socket) {
  self._currentRequest.removeListener("socket", startTimer);
  }
  }
 
- // Start the timer when the socket is opened
+ // Attach callback if passed
+ if (callback) {
+ this.on("timeout", callback);
+ }
+
+ // Start the timer if or when the socket is opened
  if (this.socket) {
  startTimer(this.socket);
  }
  else {
  this._currentRequest.once("socket", startTimer);
  }
 
+ // Clean up on events
  this.on("socket", destroyOnTimeout);
  this.once("response", clearTimer);
  this.once("error", clearTimer);

test/test.js

@@ -356,6 +356,25 @@ describe("follow-redirects", function () {
  });
  });
 
+ it("handles errors occuring before a socket is established", function () {
+ app.get("/redirect", redirectsTo("http:https://localhost:3602/b"));
+
+ var req;
+ return server.start(app)
+ .then(asPromise(function (resolve, reject) {
+ req = http.get("http:https://localhost:3600/redirect", reject);
+ req.setTimeout(3000, function () {
+ throw new Error("should not have timed out");
+ });
+ req.emit("error", new Error());
+ req.on("error", resolve);
+ }))
+ .then(function (error) {
+ assert.equal(error.code, "ECONNREFUSED");
+ clock.tick(5000);
+ });
+ });
+
  it("sets a timeout when the socket already exists", function () {
  app.get("/timeout", delay(clock, 5000, sendsJson({ timed: "out" })));