http2: compat support for array headers

PR-URL: #42901 Reviewed-By: Robert Nagy <[email protected]> Reviewed-By: Paolo Insogna <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Ricky Zhou <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]>

Author: Y1D7NG

doc/api/http2.md

@@ -3922,7 +3922,7 @@ changes:
 
 *`statusCode`{number}
 *`statusMessage`{string}
-*`headers`{Object}
+*`headers`{Object|Array}
 * Returns:{http2.Http2ServerResponse}
 
 Sends a response header to the request. The status code is a 3-digit HTTP

lib/internal/http2/compat.js

@@ -682,9 +682,19 @@ class Http2ServerResponse extends Stream{
 
 leti;
 if(ArrayIsArray(headers)){
-for(i=0;i<headers.length;i++){
-constheader=headers[i];
-this[kSetHeader](header[0],header[1]);
+if(headers.length&&ArrayIsArray(headers[0])){
+for(i=0;i<headers.length;i++){
+constheader=headers[i];
+this[kSetHeader](header[0],header[1]);
+}
+}else{
+if(headers.length%2!==0){
+thrownewERR_INVALID_ARG_VALUE('headers',headers);
+}
+
+for(i=0;i<headers.length;i+=2){
+this[kSetHeader](headers[i],headers[i+1]);
+}
 }
 }elseif(typeofheaders==='object'){
 constkeys=ObjectKeys(headers);

test/parallel/test-http2-compat-serverresponse-writehead-array.js

@@ -4,40 +4,92 @@ const common = require('../common');
 if(!common.hasCrypto)
 common.skip('missing crypto');
 constassert=require('assert');
-consth2=require('http2');
-
-// Http2ServerResponse.writeHead should support nested arrays
-
-constserver=h2.createServer();
-server.listen(0,common.mustCall(()=>{
-constport=server.address().port;
-server.once('request',common.mustCall((request,response)=>{
-constreturnVal=response.writeHead(200,[
-['foo','bar'],
-['ABC',123],
-]);
-assert.strictEqual(returnVal,response);
-response.end(common.mustCall(()=>{server.close();}));
+consthttp2=require('http2');
+
+// Http2ServerResponse.writeHead should support arrays and nested arrays
+
+{
+constserver=http2.createServer();
+server.listen(0,common.mustCall(()=>{
+constport=server.address().port;
+
+server.once('request',common.mustCall((request,response)=>{
+constreturnVal=response.writeHead(200,[
+['foo','bar'],
+['ABC',123],
+]);
+assert.strictEqual(returnVal,response);
+response.end(common.mustCall(()=>{server.close();}));
+}));
+
+constclient=http2.connect(`http://localhost:${port}`,common.mustCall(()=>{
+constrequest=client.request();
+
+request.on('response',common.mustCall((headers)=>{
+assert.strictEqual(headers.foo,'bar');
+assert.strictEqual(headers.abc,'123');
+assert.strictEqual(headers[':status'],200);
+},1));
+request.on('end',common.mustCall(()=>{
+client.close();
+}));
+request.end();
+request.resume();
+}));
 }));
+}
+
+{
+constserver=http2.createServer();
+server.listen(0,common.mustCall(()=>{
+constport=server.address().port;
+
+server.once('request',common.mustCall((request,response)=>{
+constreturnVal=response.writeHead(200,['foo','bar','ABC',123]);
+assert.strictEqual(returnVal,response);
+response.end(common.mustCall(()=>{server.close();}));
+}));
+
+constclient=http2.connect(`http://localhost:${port}`,common.mustCall(()=>{
+constrequest=client.request();
+
+request.on('response',common.mustCall((headers)=>{
+assert.strictEqual(headers.foo,'bar');
+assert.strictEqual(headers.abc,'123');
+assert.strictEqual(headers[':status'],200);
+},1));
+request.on('end',common.mustCall(()=>{
+client.close();
+}));
+request.end();
+request.resume();
+}));
+}));
+}
+
+{
+constserver=http2.createServer();
+server.listen(0,common.mustCall(()=>{
+constport=server.address().port;
+
+server.once('request',common.mustCall((request,response)=>{
+try{
+response.writeHead(200,['foo','bar','ABC',123,'extra']);
+}catch(err){
+assert.strictEqual(err.code,'ERR_INVALID_ARG_VALUE');
+}
+
+response.end(common.mustCall(()=>{server.close();}));
+}));
+
+constclient=http2.connect(`http://localhost:${port}`,common.mustCall(()=>{
+constrequest=client.request();
 
-consturl=`http://localhost:${port}`;
-constclient=h2.connect(url,common.mustCall(()=>{
-constheaders={
-':path': '/',
-':method': 'GET',
-':scheme': 'http',
-':authority': `localhost:${port}`
-};
-constrequest=client.request(headers);
-request.on('response',common.mustCall((headers)=>{
-assert.strictEqual(headers.foo,'bar');
-assert.strictEqual(headers.abc,'123');
-assert.strictEqual(headers[':status'],200);
-},1));
-request.on('end',common.mustCall(()=>{
-client.close();
+request.on('end',common.mustCall(()=>{
+client.close();
+}));
+request.end();
+request.resume();
 }));
-request.end();
-request.resume();
 }));
-}));
+}