Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions lib/_http_outgoing.js
Original file line number Diff line number Diff line change
Expand Up @@ -866,6 +866,7 @@ function strictContentLength(msg) {
);
}

let chunkBuffer = Buffer.alloc(0);
function write_(msg, chunk, encoding, callback, fromEnd) {
if (typeof callback !== 'function')
callback = nop;
Expand Down Expand Up @@ -930,11 +931,8 @@ function write_(msg, chunk, encoding, callback, fromEnd) {

let ret;
if (msg.chunkedEncoding && chunk.length !== 0) {
len ??= typeof chunk === 'string' ? Buffer.byteLength(chunk, encoding) : chunk.byteLength;
msg._send(NumberPrototypeToString(len, 16), 'latin1', null);
msg._send(crlf_buf, null, null);
msg._send(chunk, encoding, null, len);
ret = msg._send(crlf_buf, null, callback);
chunkBuffer = Buffer.concat([chunkBuffer, Buffer.from(chunk)]);
ret = true;
} else {
ret = msg._send(chunk, encoding, callback, len);
}
Expand Down Expand Up @@ -1046,6 +1044,14 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
throw new ERR_HTTP_CONTENT_LENGTH_MISMATCH(this[kBytesWritten], this._contentLength);
}

if (!this._headerSent && Buffer.byteLength(chunkBuffer)) {
this._send(NumberPrototypeToString(Buffer.byteLength(chunkBuffer), 16), 'latin1', null);
this._send(crlf_buf, null, null);
this._send(chunkBuffer, null, null);
this._send(crlf_buf, null, callback);
chunkBuffer = Buffer.alloc(0)
}

const finish = onFinish.bind(undefined, this);

if (this._hasBody && this.chunkedEncoding) {
Expand All @@ -1062,7 +1068,6 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
this.socket.uncork();
}
this[kCorked] = 0;

this.finished = true;

// There is the first message on the outgoing queue, and we've sent
Expand Down
33 changes: 33 additions & 0 deletions test/own/test-http-outgoing-message.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
In the first line of the test file you should
enable strict mode, unless you test something
that needs it disabled
*/
'use strict';

/*
the common package gives you some commonly
used testing methods, like mustCall
*/
const common = require('../common');

/*
a small description on what you are testing
*/
// This test ensures that the http-parser can handle UTF-8 characters
// in the http header.

const assert = require('assert');
const http = require('http');

/*
the body of the actual test - tests should exit with code 0 on success
*/
const server = http.createServer(
common.mustCall((request, response) => {
response.write('hello world');
response.end();
})
);

server.listen(3000, () => {});