http2: fix file close error condition at respondWithFd

addaleax · targos · commit 5959023b7661 · 2019-11-10T14:50:07.000+01:00
Closing a FileHandle almost never fails, so it was hard to notice before that `stream.emit(err)` would not emit an error event due to the missing event name. Destroying the stream with the error seems like the right thing to do in that scenario. PR-URL: #29884 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Minwoo Jung <minwoo@nodesource.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gus Caplan <me@gus.host>
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
@@ -2174,14 +2174,11 @@ function processHeaders(oldHeaders) {
   return headers;
 }
 
-function onFileCloseError(stream, err) {
-  stream.emit(err);
-}
 
 function onFileUnpipe() {
   const stream = this.sink[kOwner];
   if (stream.ownsFd)
-    this.source.close().catch(onFileCloseError.bind(stream));
+    this.source.close().catch(stream.destroy.bind(stream));
   else
     this.source.releaseFD();
 }

Original file line number	Diff line number	Diff line change
`@@ -2174,14 +2174,11 @@ function processHeaders(oldHeaders) {`
`2174`	`2174`	`return headers;`
`2175`	`2175`	`}`
`2176`	`2176`
`2177`		`-function onFileCloseError(stream, err) {`
`2178`		`- stream.emit(err);`
`2179`		`-}`
`2180`	`2177`
`2181`	`2178`	`function onFileUnpipe() {`
`2182`	`2179`	`const stream = this.sink[kOwner];`
`2183`	`2180`	`if (stream.ownsFd)`
`2184`		`- this.source.close().catch(onFileCloseError.bind(stream));`
	`2181`	`+ this.source.close().catch(stream.destroy.bind(stream));`
`2185`	`2182`	`else`
`2186`	`2183`	`this.source.releaseFD();`
`2187`	`2184`	`}`