This repository has been archived by the owner on Aug 31, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This changes the error handling model of ServerHttp2Stream, ServerHttp2Request and ServerHttp2Response. An 'error' emitted on ServerHttp2Stream will not go to 'uncaughtException' anymore, but to the server 'streamError'. On the stream 'error', ServerHttp2Request will emit 'abort', while ServerHttp2Response would do nothing. It also updates respondWith* to the new error handling. Fixes: nodejs/node#14963 PR-URL: nodejs/node#14991 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]>
- Loading branch information
Showing
9 changed files
with
329 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| // Flags: --expose-http2 --expose-internals | ||
| 'use strict'; | ||
|
|
||
| const common = require('../common'); | ||
| if (!common.hasCrypto) | ||
| common.skip('missing crypto'); | ||
| const assert = require('assert'); | ||
| const h2 = require('http2'); | ||
| const { Http2Stream } = require('internal/http2/core'); | ||
|
|
||
| // Errors should not be reported both in Http2ServerRequest | ||
| // and Http2ServerResponse | ||
|
|
||
| let expected = null; | ||
|
|
||
| const server = h2.createServer(common.mustCall(function(req, res) { | ||
| req.on('error', common.mustNotCall()); | ||
| res.on('error', common.mustNotCall()); | ||
| req.on('aborted', common.mustCall()); | ||
| res.on('aborted', common.mustNotCall()); | ||
|
|
||
| res.write('hello'); | ||
|
|
||
| expected = new Error('kaboom'); | ||
| res.stream.destroy(expected); | ||
| server.close(); | ||
| })); | ||
|
|
||
| server.on('streamError', common.mustCall(function(err, stream) { | ||
| assert.strictEqual(err, expected); | ||
| assert.strictEqual(stream instanceof Http2Stream, true); | ||
| })); | ||
|
|
||
| server.listen(0, common.mustCall(function() { | ||
| const port = server.address().port; | ||
|
|
||
| const url = `http://localhost:${port}`; | ||
| const client = h2.connect(url, common.mustCall(function() { | ||
| const headers = { | ||
| ':path': '/foobar', | ||
| ':method': 'GET', | ||
| ':scheme': 'http', | ||
| ':authority': `localhost:${port}`, | ||
| }; | ||
| const request = client.request(headers); | ||
| request.on('data', common.mustCall(function(chunk) { | ||
| // cause an error on the server side | ||
| client.destroy(); | ||
| })); | ||
| request.end(); | ||
| })); | ||
| })); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| // Flags: --expose-http2 | ||
| 'use strict'; | ||
|
|
||
| const common = require('../common'); | ||
| if (!common.hasCrypto) | ||
| common.skip('missing crypto'); | ||
| const http2 = require('http2'); | ||
| const assert = require('assert'); | ||
| const path = require('path'); | ||
|
|
||
| const { | ||
| HTTP2_HEADER_CONTENT_TYPE | ||
| } = http2.constants; | ||
|
|
||
| const server = http2.createServer(); | ||
| server.on('stream', (stream) => { | ||
| const file = path.join(process.cwd(), 'not-a-file'); | ||
| stream.respondWithFile(file, { | ||
| [HTTP2_HEADER_CONTENT_TYPE]: 'text/plain' | ||
| }, { | ||
| onError(err) { | ||
| common.expectsError({ | ||
| code: 'ENOENT', | ||
| type: Error, | ||
| message: `ENOENT: no such file or directory, open '${file}'` | ||
| })(err); | ||
|
|
||
| stream.respond({ ':status': 404 }); | ||
| stream.end(); | ||
| }, | ||
| statCheck: common.mustNotCall() | ||
| }); | ||
| }); | ||
| server.listen(0, () => { | ||
|
|
||
| const client = http2.connect(`http://localhost:${server.address().port}`); | ||
| const req = client.request(); | ||
|
|
||
| req.on('response', common.mustCall((headers) => { | ||
| assert.strictEqual(headers[':status'], 404); | ||
| })); | ||
| req.on('data', common.mustNotCall()); | ||
| req.on('end', common.mustCall(() => { | ||
| client.destroy(); | ||
| server.close(); | ||
| })); | ||
| req.end(); | ||
| }); |
Oops, something went wrong.