http2: fix ping callback

BridgeAR · kjin · commit a69c76bea50f · 2018-08-23T10:43:33.000-07:00
In case there was no ack, the callback would have returned more than the error as return value. This makes sure that is not the case anymore. PR-URL: nodejs#20311 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
@@ -285,8 +285,8 @@ function onStreamClose(code) {
   if (!stream.closed)
     closeStream(stream, code, false);
 
-  if (this[kState].fd !== undefined)
-    tryClose(this[kState].fd);
+  if (stream[kState].fd !== undefined)
+    tryClose(stream[kState].fd);
 
   // Defer destroy we actually emit end.
   if (stream._readableState.endEmitted || code !== NGHTTP2_NO_ERROR) {
@@ -662,8 +662,11 @@ const proxySocketHandler = {
 // data received on the PING acknowlegement.
 function pingCallback(cb) {
   return function pingCallback(ack, duration, payload) {
-    const err = ack ? null : new errors.Error('ERR_HTTP2_PING_CANCEL');
-    cb(err, duration, payload);
+    if (ack) {
+      cb(null, duration, payload);
+    } else {
+      cb(new errors.Error('ERR_HTTP2_PING_CANCEL'));
+    }
   };
 }
 
