tls: fix double 'error' events on HTTPS Requests

Fixes #2549.

1 files changed, 11 insertions, 10 deletions

diff --git a/lib/tls.js b/lib/tls.js
index b77dec43d..0dd178235 100644
--- a/lib/tls.js
+++ b/lib/tls.js
@@ -271,7 +271,11 @@ CryptoStream.prototype._done = function() {
       this.pair.encrypted._doneFlag &&
       !this.pair._doneFlag) {
     // If both streams are done:
-    this.pair.destroy();
+    if (!this.pair._secureEstablished) {
+      this.pair.error();
+    } else {
+      this.pair.destroy();
+    }
   }
 };
 
@@ -720,7 +724,6 @@ SecurePair.prototype.maybeInitFinished = function() {
 
 SecurePair.prototype.destroy = function() {
   var self = this;
-  var error = this.ssl.error;
 
   if (!this._doneFlag) {
     this._doneFlag = true;
@@ -736,21 +739,19 @@ SecurePair.prototype.destroy = function() {
       self.encrypted.emit('close');
       self.cleartext.emit('close');
     });
-
-    if (!this._secureEstablished) {
-      if (!error) {
-        error = new Error('socket hang up');
-        error.code = 'ECONNRESET';
-      }
-      this.emit('error', error);
-    }
   }
 };
 
 
 SecurePair.prototype.error = function() {
   if (!this._secureEstablished) {
+    var error = this.ssl.error;
+    if (!error) {
+      error = new Error('socket hang up');
+      error.code = 'ECONNRESET';
+    }
     this.destroy();
+    this.emit('error', error);
   } else {
     var err = this.ssl.error;
     this.ssl.error = null;