Fix SSL handshake error to be catchable

fixes #800

Author: dougwilson

Changes.md

@@ -16,6 +16,7 @@ you spot any mistakes.
 * Remove console.warn from PoolCluster #744
 * Fix `pool.end` to handle queued connections #797
 * Fix `pool.releaseConnection` to keep connection queue flowing #797
+* Fix SSL handshake error to  be catchable #800
 
 ## v2.1.1 (2014-03-13)
 

lib/protocol/sequences/Handshake.js

@@ -35,8 +35,16 @@ Handshake.prototype['HandshakeInitializationPacket'] = function(packet) {
   var serverSSLSupport = packet.serverCapabilities1 & ClientConstants.CLIENT_SSL; 
 
   if (this._config.ssl) {
-    if (!serverSSLSupport)
-      throw new Error('Server does not support secure connnection');
+    if (!serverSSLSupport) {
+      var err = new Error('Server does not support secure connnection');
+
+      err.code = 'HANDSHAKE_NO_SSL_SUPPORT';
+      err.fatal = true;
+
+      this.end(err);
+      return;
+    }
+
     this._config.clientFlags |= ClientConstants.CLIENT_SSL;
     this.emit('packet', new Packets.SSLRequestPacket({
       clientFlags   : this._config.clientFlags,

test/integration/connection/test-connection-ssl-denied.js

@@ -0,0 +1,28 @@
+var assert     = require('assert');
+var common     = require('../../common');
+var connection = common.createConnection({
+  port : common.fakeServerPort,
+  ssl  : 'Amazon RDS'
+});
+
+var server = common.createFakeServer();
+
+var connectErr;
+server.listen(common.fakeServerPort, function(err) {
+  if (err) throw err;
+
+  connection.connect(function(err) {
+    connectErr = err;
+    server.destroy();
+  });
+});
+
+server.on('connection', function(incomingConnection) {
+  incomingConnection.handshake();
+});
+
+process.on('exit', function() {
+  assert.ok(connectErr);
+  assert.equal(connectErr.code, 'HANDSHAKE_NO_SSL_SUPPORT');
+  assert.ok(connectErr.fatal);
+});