nodejs
diff --git a/Collapse file
‎doc/api/errors.md‎
Copy file name to clipboardExpand all lines: doc/api/errors.md
+6Lines changed: 6 additions & 0 deletions
Display the source diff
Display the rich diff b/Collapse file
‎doc/api/errors.md‎
Copy file name to clipboardExpand all lines: doc/api/errors.md
+6Lines changed: 6 additions & 0 deletions
Display the source diff
Display the rich diff
diff --git a/Collapse file
‎doc/api/http2.md‎
Copy file name to clipboardExpand all lines: doc/api/http2.md
+3Lines changed: 3 additions & 0 deletions
Display the source diff
Display the rich diff b/Collapse file
‎doc/api/http2.md‎
Copy file name to clipboardExpand all lines: doc/api/http2.md
+3Lines changed: 3 additions & 0 deletions
Display the source diff
Display the rich diff
diff --git a/Collapse file
‎lib/internal/errors.js‎
Copy file name to clipboardExpand all lines: lib/internal/errors.js
+2Lines changed: 2 additions & 0 deletions b/Collapse file
‎lib/internal/errors.js‎
Copy file name to clipboardExpand all lines: lib/internal/errors.js
+2Lines changed: 2 additions & 0 deletions
diff --git a/Collapse file
‎lib/internal/http2/core.js‎
Copy file name to clipboardExpand all lines: lib/internal/http2/core.js
+2Lines changed: 2 additions & 0 deletions b/Collapse file
‎lib/internal/http2/core.js‎
Copy file name to clipboardExpand all lines: lib/internal/http2/core.js
+2Lines changed: 2 additions & 0 deletions
diff --git a/Collapse file
‎test/parallel/test-http2-server-push-stream.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-http2-server-push-stream.js
+8Lines changed: 8 additions & 0 deletions b/Collapse file
‎test/parallel/test-http2-server-push-stream.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-http2-server-push-stream.js
+8Lines changed: 8 additions & 0 deletions
@@ -775,6 +775,12 @@ required to send an acknowledgment that it has received and applied the new
 be sent at any given time. This error code is used when that limit has been
 reached.
 
+<a id="ERR_HTTP2_NESTED_PUSH"></a>
+### ERR_HTTP2_NESTED_PUSH
+
+An attempt was made to initiate a new push stream from within a push stream.
+Nested push streams are not permitted.
+
 <a id="ERR_HTTP2_NO_SOCKET_MANIPULATION"></a>
 ### ERR_HTTP2_NO_SOCKET_MANIPULATION
 
 
@@ -1261,6 +1261,9 @@ Setting the weight of a push stream is not allowed in the `HEADERS` frame. Pass
 a `weight` value to `http2stream.priority` with the `silent` option set to
 `true` to enable server-side bandwidth balancing between concurrent streams.
 
+Calling `http2stream.pushStream()` from within a pushed stream is not permitted
+and will throw an error.
+
 #### http2stream.respond([headers[, options]])
 <!-- YAML
 added: v8.4.0
 
@@ -321,6 +321,8 @@ E('ERR_HTTP2_INVALID_SETTING_VALUE',
 E('ERR_HTTP2_INVALID_STREAM', 'The stream has been destroyed');
 E('ERR_HTTP2_MAX_PENDING_SETTINGS_ACK',
   (max) => `Maximum number of pending settings acknowledgements (${max})`);
+E('ERR_HTTP2_NESTED_PUSH',
+  'A push stream cannot initiate another push stream.', Error);
 E('ERR_HTTP2_NO_SOCKET_MANIPULATION',
   'HTTP/2 sockets should not be directly manipulated (e.g. read and written)');
 E('ERR_HTTP2_OUT_OF_STREAMS',
 
@@ -2116,6 +2116,8 @@ class ServerHttp2Stream extends Http2Stream {
   pushStream(headers, options, callback) {
     if (!this.pushAllowed)
       throw new errors.Error('ERR_HTTP2_PUSH_DISABLED');
+    if (this[kID] % 2 === 0)
+      throw new errors.Error('ERR_HTTP2_NESTED_PUSH');
 
     const session = this[kSession];
 
 
@@ -22,6 +22,14 @@ server.on('stream', common.mustCall((stream, headers) => {
         'x-push-data': 'pushed by server',
       });
       push.end('pushed by server data');
+
+      common.expectsError(() => {
+        push.pushStream({}, common.mustNotCall());
+      }, {
+        code: 'ERR_HTTP2_NESTED_PUSH',
+        type: Error
+      });
+
       stream.end('test');
     }));
   }