From ed0ef714761619986ad1648d42a60968119193f0 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sat, 29 Apr 2017 20:59:44 +0200 Subject: [PATCH] http: fix first body chunk fast case for UTF-16 `http.OutgoingMessage` tried to send the first chunk together with the headers by concatenating them together as a string, but the list of encodings for which that works was incorrect. Change it from a blacklist to a whitelist. Fixes: https://github.com/nodejs/node/issues/11788 PR-URL: https://github.com/nodejs/node/pull/12747 Reviewed-By: Refael Ackermann Reviewed-By: James M Snell Reviewed-By: Colin Ihrig Reviewed-By: Benjamin Gruenbaum --- lib/_http_outgoing.js | 3 +- ...utgoing-first-chunk-singlebyte-encoding.js | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 test/parallel/test-http-outgoing-first-chunk-singlebyte-encoding.js diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js index a8e04d543a9f56..6ad428fa18eec3 100644 --- a/lib/_http_outgoing.js +++ b/lib/_http_outgoing.js @@ -229,8 +229,7 @@ OutgoingMessage.prototype._send = function _send(data, encoding, callback) { // this at a lower level and in a more general way. if (!this._headerSent) { if (typeof data === 'string' && - encoding !== 'hex' && - encoding !== 'base64') { + (encoding === 'utf8' || encoding === 'latin1' || !encoding)) { data = this._header + data; } else { this.output.unshift(this._header); diff --git a/test/parallel/test-http-outgoing-first-chunk-singlebyte-encoding.js b/test/parallel/test-http-outgoing-first-chunk-singlebyte-encoding.js new file mode 100644 index 00000000000000..214287a6ffc157 --- /dev/null +++ b/test/parallel/test-http-outgoing-first-chunk-singlebyte-encoding.js @@ -0,0 +1,36 @@ +'use strict'; +const common = require('../common'); + +// Regression test for https://github.com/nodejs/node/issues/11788. + +const assert = require('assert'); +const http = require('http'); +const net = require('net'); + +for (const enc of ['utf8', 'utf16le', 'latin1', 'UTF-8']) { + const server = http.createServer(common.mustCall((req, res) => { + res.setHeader('content-type', `text/plain; charset=${enc}`); + res.write('helloworld', enc); + res.end(); + })).listen(0); + + server.on('listening', common.mustCall(() => { + const buffers = []; + const socket = net.connect(server.address().port); + socket.write('GET / HTTP/1.0\r\n\r\n'); + socket.on('data', (data) => buffers.push(data)); + socket.on('end', common.mustCall(() => { + const received = Buffer.concat(buffers); + const headerEnd = received.indexOf('\r\n\r\n', 'utf8'); + assert.notStrictEqual(headerEnd, -1); + + const header = received.toString('utf8', 0, headerEnd).split(/\r\n/g); + const body = received.toString(enc, headerEnd + 4); + + assert.strictEqual(header[0], 'HTTP/1.1 200 OK'); + assert.strictEqual(header[1], `content-type: text/plain; charset=${enc}`); + assert.strictEqual(body, 'helloworld'); + server.close(); + })); + })); +}