Merge remote branch 'origin/v0.6'

Conflicts:
	Makefile
	lib/_debugger.js

1 files changed, 15 insertions, 1 deletions

diff --git a/lib/tls.js b/lib/tls.js
index e4f332d41..47f2e0c54 100644
--- a/lib/tls.js
+++ b/lib/tls.js
@@ -576,7 +576,6 @@ function SecurePair(credentials, isServer, requestCert, rejectUnauthorized,
     requestCert = true;
   }
 
-  this._secureEstablished = false;
   this._rejectUnauthorized = rejectUnauthorized ? true : false;
   this._requestCert = requestCert ? true : false;
 
@@ -721,6 +720,7 @@ SecurePair.prototype.maybeInitFinished = function() {
 
 SecurePair.prototype.destroy = function() {
   var self = this;
+  var error = this.ssl.error;
 
   if (!this._doneFlag) {
     this._doneFlag = true;
@@ -736,6 +736,14 @@ 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);
+    }
   }
 };
 
@@ -905,6 +913,9 @@ function Server(/* [options], listener */) {
         }
       }
     });
+    pair.on('error', function(err) {
+      self.emit('clientError', err);
+    });
   });
 
   if (listener) {
@@ -1061,6 +1072,9 @@ exports.connect = function(port /* host, options, cb */) {
       cleartext.emit('secureConnect');
     }
   });
+  pair.on('error', function(err) {
+    cleartext.emit('error', err);
+  });
 
   cleartext._controlReleased = true;
   return cleartext;