Skip to content
Permalink
Browse files

http: buffer writes even while no socket assigned

PR-URL: #29019
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
  • Loading branch information...
ronag authored and targos committed Aug 6, 2019
1 parent 6bc4620 commit c396b2a5b25cae7881946df7f756b38580b33003
Showing with 29 additions and 3 deletions.
  1. +3 −1 lib/_http_outgoing.js
  2. +7 −2 lib/internal/streams/state.js
  3. +19 −0 test/parallel/test-http-outgoing-buffer.js
@@ -23,6 +23,7 @@

const { Object, ObjectPrototype } = primordials;

const { getDefaultHighWaterMark } = require('internal/streams/state');
const assert = require('internal/assert');
const Stream = require('stream');
const internalUtil = require('internal/util');
@@ -51,6 +52,7 @@ const {
} = require('internal/errors');
const { validateString } = require('internal/validators');

const HIGH_WATER_MARK = getDefaultHighWaterMark();
const { CRLF, debug } = common;

const kIsCorked = Symbol('isCorked');
@@ -277,7 +279,7 @@ function _writeRaw(data, encoding, callback) {
this.outputData.push({ data, encoding, callback });
this.outputSize += data.length;
this._onPendingData(data.length);
return false;
return this.outputSize < HIGH_WATER_MARK;
}


@@ -9,6 +9,10 @@ function highWaterMarkFrom(options, isDuplex, duplexKey) {
isDuplex ? options[duplexKey] : null;
}

function getDefaultHighWaterMark(objectMode) {
return objectMode ? 16 : 16 * 1024;
}

function getHighWaterMark(state, options, duplexKey, isDuplex) {
const hwm = highWaterMarkFrom(options, isDuplex, duplexKey);
if (hwm != null) {
@@ -20,9 +24,10 @@ function getHighWaterMark(state, options, duplexKey, isDuplex) {
}

// Default value
return state.objectMode ? 16 : 16 * 1024;
return getDefaultHighWaterMark(state.objectMode);
}

module.exports = {
getHighWaterMark
getHighWaterMark,
getDefaultHighWaterMark
};
@@ -0,0 +1,19 @@
// Flags: --expose-internals
'use strict';
require('../common');
const assert = require('assert');
const { getDefaultHighWaterMark } = require('internal/streams/state');

const http = require('http');
const OutgoingMessage = http.OutgoingMessage;

const msg = new OutgoingMessage();
msg._implicitHeader = function() {};

// Writes should be buffered until highwatermark
// even when no socket is assigned.

assert.strictEqual(msg.write('asd'), true);
while (msg.write('asd'));
const highwatermark = msg.writableHighWaterMark || getDefaultHighWaterMark();
assert(msg.outputSize >= highwatermark);

0 comments on commit c396b2a

Please sign in to comment.
You can’t perform that action at this time.