From 72abf040ac48253399787a60244318c0500b4770 Mon Sep 17 00:00:00 2001 From: mauve Date: Mon, 17 Aug 2020 20:57:59 -0400 Subject: Fix up protocol issues --- client.js | 4 +++- connect.js | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/client.js b/client.js index e4a3427..4b8bd8d 100644 --- a/client.js +++ b/client.js @@ -59,7 +59,7 @@ const _request = (pathOrUrl, opt, cb) => { }) // send request - socket.end(encodeURI(pathOrUrl) + ' \r\n') + socket.end(pathOrUrl + '\r\n') }) } @@ -127,6 +127,7 @@ const sendGeminiRequest = (pathOrUrl, opt, done) => { letUserConfirmClientCertUsage, clientCertStore, tlsOpt, + verifyAlpnId, } = { followRedirects: false, // https://gemini.circumlunar.space/docs/spec-spec.txt, 1.4.3 @@ -162,6 +163,7 @@ const sendGeminiRequest = (pathOrUrl, opt, done) => { hostname: target.hostname || 'localhost', port: target.port || DEFAULT_PORT, tlsOpt, + verifyAlpnId, } let cb = (err, res) => { diff --git a/connect.js b/connect.js index d2e8a6e..1c216a5 100644 --- a/connect.js +++ b/connect.js @@ -28,7 +28,8 @@ const connectToGeminiServer = (opt, cb) => { const socket = connectTls({ ALPNProtocols: [ALPN_ID], minVersion: MIN_TLS_VERSION, - hostname, port, + host: hostname, + port, cert, key, passphrase, ...tlsOpt, }) -- cgit v1.3