Skip to content

Commit

Permalink
http: fix first body chunk fast case for UTF-16
Browse files Browse the repository at this point in the history
`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: #11788
PR-URL: #12747
Reviewed-By: Refael Ackermann <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
  • Loading branch information
addaleax authored and gibfahn committed Jun 20, 2017
1 parent 0799b50 commit a06ceae
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 2 deletions.
3 changes: 1 addition & 2 deletions lib/_http_outgoing.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ OutgoingMessage.prototype._send = function(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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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();
}));
}));
}

0 comments on commit a06ceae

Please sign in to comment.