diff --git a/.gitignore b/.gitignore index bae2a20a..b6e058f2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ package-lock.json dist .DS_Store .vscode/ +manually-test-on-heroku.js diff --git a/packages/pg/lib/connection.js b/packages/pg/lib/connection.js index 6fa0696c..a63d9cde 100644 --- a/packages/pg/lib/connection.js +++ b/packages/pg/lib/connection.js @@ -115,17 +115,7 @@ Connection.prototype.connect = function (port, host) { } self.stream = tls.connect(options) self.stream.on('error', reportStreamError) - - // send SSLRequest packet - const buff = Buffer.alloc(8) - buff.writeUInt32BE(8) - buff.writeUInt32BE(80877103, 4) - if (self.stream.writable) { - self.stream.write(buff) - } - self.attachListeners(self.stream) - self.emit('sslconnect') }) } diff --git a/packages/pg/test/integration/gh-issues/2085-tests.js b/packages/pg/test/integration/gh-issues/2085-tests.js new file mode 100644 index 00000000..36f30c74 --- /dev/null +++ b/packages/pg/test/integration/gh-issues/2085-tests.js @@ -0,0 +1,15 @@ + + +"use strict" +var helper = require('./../test-helper') +var assert = require('assert') + +const suite = new helper.Suite() + +suite.testAsync('it should connect over ssl', async () => { + const client = new helper.pg.Client({ ssl: 'require'}) + await client.connect() + const { rows } = await client.query('SELECT NOW()') + assert.strictEqual(rows.length, 1) + await client.end() +})