http: outgoing cork

PR-URL: #29053 Reviewed-By: Anna Henningsen <[email protected]>

Author: ronag

doc/api/http.md

@@ -1223,6 +1223,13 @@ added: v0.3.0
 
 See [`response.socket`][].
 
+### `response.cork()`
+<!-- YAML
+added: REPLACEME
+-->
+
+See [`writable.cork()`][].
+
 ### `response.end([data[, encoding]][, callback])`
 <!-- YAML
 added: v0.1.90
@@ -1508,6 +1515,13 @@ response.statusMessage = 'Not found'
 After response header was sent to the client, this property indicates the
 status message which was sent out.
 
+### `response.uncork()`
+<!-- YAML
+added: REPLACEME
+-->
+
+See [`writable.uncork()`][].
+
 ### `response.writableEnded`
 <!-- YAML
 added: v12.9.0
@@ -2348,3 +2362,5 @@ not abort the request or do anything besides add a `'timeout'` event.
 [`socket.unref()`]: net.html#net_socket_unref
 [`url.parse()`]: url.html#url_url_parse_urlstring_parsequerystring_slashesdenotehost
 [`HPE_HEADER_OVERFLOW`]: errors.html#errors_hpe_header_overflow
+[`writable.cork()`]: stream.html#stream_writable_cork
+[`writable.uncork()`]: stream.html#stream_writable_uncork

lib/_http_outgoing.js

@@ -55,6 +55,8 @@ const{validateString } = require('internal/validators');
 constHIGH_WATER_MARK=getDefaultHighWaterMark();
 const{CRLF, debug }=common;
 
+constkCorked=Symbol('corked');
+
 constRE_CONN_CLOSE=/(?:^|\W)close(?:$|\W)/i;
 constRE_TE_CHUNKED=common.chunkExpression;
 
@@ -98,6 +100,7 @@ function OutgoingMessage(){
 
 this.finished=false;
 this._headerSent=false;
+this[kCorked]=0;
 
 this.socket=null;
 this.connection=null;
@@ -137,6 +140,13 @@ Object.defineProperty(OutgoingMessage.prototype, 'writableHighWaterMark',{
 }
 });
 
+Object.defineProperty(OutgoingMessage.prototype,'writableCorked',{
+get(){
+constcorked=this.socket ? this.socket.writableCorked : 0;
+returncorked+this[kCorked];
+}
+});
+
 Object.defineProperty(OutgoingMessage.prototype,'_headers',{
 get: internalUtil.deprecate(function(){
 returnthis.getHeaders();
@@ -204,6 +214,21 @@ OutgoingMessage.prototype._renderHeaders = function _renderHeaders(){
 returnheaders;
 };
 
+OutgoingMessage.prototype.cork=function(){
+if(this.socket){
+this.socket.cork();
+}else{
+this[kCorked]++;
+}
+};
+
+OutgoingMessage.prototype.uncork=function(){
+if(this.socket){
+this.socket.uncork();
+}elseif(this[kCorked]){
+this[kCorked]--;
+}
+};
 
 OutgoingMessage.prototype.setTimeout=functionsetTimeout(msecs,callback){
 
@@ -694,7 +719,10 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback){
 returnthis;
 }
 
-varuncork;
+if(this.socket){
+this.socket.cork();
+}
+
 if(chunk){
 if(typeofchunk!=='string'&&!(chunkinstanceofBuffer)){
 thrownewERR_INVALID_ARG_TYPE('chunk',['string','Buffer'],chunk);
@@ -705,10 +733,6 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback){
 else
 this._contentLength=chunk.length;
 }
-if(this.connection){
-this.connection.cork();
-uncork=true;
-}
 write_(this,chunk,encoding,null,true);
 }elseif(!this._header){
 this._contentLength=0;
@@ -727,8 +751,12 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback){
 this._send('','latin1',finish);
 }
 
-if(uncork)
-this.connection.uncork();
+if(this.socket){
+// Fully uncork connection on end().
+this.socket._writableState.corked=1;
+this.socket.uncork();
+}
+this[kCorked]=0;
 
 this.finished=true;
 
@@ -789,6 +817,11 @@ OutgoingMessage.prototype._flush = function _flush(){
 };
 
 OutgoingMessage.prototype._flushOutput=function_flushOutput(socket){
+while(this[kCorked]){
+this[kCorked]--;
+socket.cork();
+}
+
 constoutputLength=this.outputData.length;
 if(outputLength<=0)
 returnundefined;

lib/internal/http2/compat.js

@@ -503,6 +503,10 @@ class Http2ServerResponse extends Stream{
 returnthis[kState].statusCode;
 }
 
+getwritableCorked(){
+returnthis[kStream].writableCorked;
+}
+
 setstatusCode(code){
 code|=0;
 if(code>=100&&code<200)
@@ -627,6 +631,14 @@ class Http2ServerResponse extends Stream{
 returnthis;
 }
 
+cork(){
+this[kStream].cork();
+}
+
+uncork(){
+this[kStream].uncork();
+}
+
 write(chunk,encoding,cb){
 if(typeofencoding==='function'){
 cb=encoding;

test/parallel/test-http-response-cork.js

@@ -0,0 +1,33 @@
+'use strict';
+constcommon=require('../common');
+consthttp=require('http');
+constassert=require('assert');
+
+constserver=http.createServer((req,res)=>{
+letcorked=false;
+constoriginalWrite=res.socket.write;
+res.socket.write=common.mustCall((...args)=>{
+assert.strictEqual(corked,false);
+returnoriginalWrite.call(res.socket, ...args);
+},5);
+corked=true;
+res.cork();
+assert.strictEqual(res.writableCorked,res.socket.writableCorked);
+res.cork();
+assert.strictEqual(res.writableCorked,res.socket.writableCorked);
+res.writeHead(200,{'a-header': 'a-header-value'});
+res.uncork();
+assert.strictEqual(res.writableCorked,res.socket.writableCorked);
+corked=false;
+res.end('asd');
+assert.strictEqual(res.writableCorked,res.socket.writableCorked);
+});
+
+server.listen(0,()=>{
+http.get({port: server.address().port},(res)=>{
+res.on('data',common.mustCall());
+res.on('end',common.mustCall(()=>{
+server.close();
+}));
+});
+});