http2: Http2ServerResponse.end() should always return self

ronag · BridgeAR · commit 6adcc6f57410 · 2019-03-14T17:15:25.000+01:00
PR-URL: #24346 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
diff --git a/lib/internal/http2/compat.js b/lib/internal/http2/compat.js
@@ -648,7 +648,7 @@ class Http2ServerResponse extends Stream {
 
 if ((state.closed || state.ending) &&
 state.headRequest === stream.headRequest) {
- return false;
+ return this;
 }
 
 if (typeof chunk === 'function') {
diff --git a/test/parallel/test-http2-compat-serverresponse-end.js b/test/parallel/test-http2-compat-serverresponse-end.js
@@ -60,6 +60,34 @@ const {
 }));
 }
 
+{
+ // Http2ServerResponse.end should return self after end
+ const server = createServer(mustCall((request, response) => {
+ strictEqual(response, response.end());
+ strictEqual(response, response.end());
+ server.close();
+ }));
+ server.listen(0, mustCall(() => {
+ const { port } = server.address();
+ const url = `http://localhost:${port}`;
+ const client = connect(url, mustCall(() => {
+ const headers = {
+ ':path': '/',
+ ':method': 'GET',
+ ':scheme': 'http',
+ ':authority': `localhost:${port}`
+ };
+ const request = client.request(headers);
+ request.setEncoding('utf8');
+ request.on('end', mustCall(() => {
+ client.close();
+ }));
+ request.end();
+ request.resume();
+ }));
+ }));
+}
+
 {
 // Http2ServerResponse.end can omit encoding arg, sets it to utf-8
 const server = createServer(mustCall((request, response) => {

Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,7 @@ class Http2ServerResponse extends Stream {`
`648`	`648`
`649`	`649`	`if((state.closed\|\|state.ending)&&`
`650`	`650`	`state.headRequest===stream.headRequest){`
`651`		`-returnfalse;`
	`651`	`+returnthis;`
`652`	`652`	`}`
`653`	`653`
`654`	`654`	`if(typeofchunk==='function'){`
-Original file line number
+Diff line change
 }));
+}
 +{
 +// Http2ServerResponse.end should return self after end
 +constserver=createServer(mustCall((request,response)=>{
 +strictEqual(response,response.end());
 +strictEqual(response,response.end());
 +server.close();
 +}));
 +server.listen(0,mustCall(()=>{
 +const{ port }=server.address();
 +consturl=`http://localhost:${port}`;
 +constclient=connect(url,mustCall(()=>{
 +constheaders={
 +':path': '/',
 +':method': 'GET',
 +':scheme': 'http',
 +':authority': `localhost:${port}`
 +};
 +constrequest=client.request(headers);
 +request.setEncoding('utf8');
 +request.on('end',mustCall(()=>{
 +client.close();
 +}));
 +request.end();
 +request.resume();
 +}));
 +}));
 +}
++
+{
 // Http2ServerResponse.end can omit encoding arg, sets it to utf-8
 constserver=createServer(mustCall((request,response)=>{