Skip to content

http: add rawPacket in err of clientError event #17672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
XadillaX wants to merge 6 commits into from
Closed

http: add rawPacket in err of clientError event #17672

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e9eb792
http: add rawPacket in err of `clientError` event
XadillaX Dec 14, 2017
5e1369f
update after addaleax' review
XadillaX Dec 15, 2017
0e73e2c
update after addaleax' review
XadillaX Dec 15, 2017
9758fb1
update after bnoordhuis' review
XadillaX Dec 18, 2017
008e5a8
update
XadillaX Dec 18, 2017
7fb6c62
long line
XadillaX Dec 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update after addaleax' review
  • Loading branch information
@XadillaX
XadillaX committed Dec 15, 2017
commit 5e1369f0584c305e315943a64dc995c57aba2ffc
8 changes: 4 additions & 4 deletions doc/api/http.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,10 +765,10 @@ object, so any HTTP response sent, including response headers and payload,
*must* be written directly to the `socket` object. Care must be taken to
ensure the response is a properly formatted HTTP response message.

> `err` is an instance of `Error` with two extra columns:
>
> + `bytesParsed`: the bytes count of request packet that Node.js may parse correctly;
> + `rawPacket`: the raw packet of current request.
`err` is an instance of `Error` with two extra columns:

+ `bytesParsed`: the bytes count of request packet that Node.js may have parsed correctly;
Copy link
Copy Markdown
Member

@bnoordhuis bnoordhuis Dec 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Long line.

+ `rawPacket`: the raw packet of current request.
Copy link
Copy Markdown
Member

@addaleax addaleax Dec 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, one thing I forgot to mention: Can you list the addition of rawPacket in the changes: section of the YAML block for clientError?

Copy link
Copy Markdown
Contributor Author

@XadillaX XadillaX Dec 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done


### Event: 'close'
<!-- YAML
Expand Down
8 changes: 4 additions & 4 deletions lib/_http_server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,11 @@ function socketOnError(e) {
function onParserExecuteCommon(server, socket, parser, state, ret, d) {
resetSocketTimeout(server, socket, state);

if (!d)
d = parser.getCurrentBuffer();
Copy link
Copy Markdown
Member

@bnoordhuis bnoordhuis Dec 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you move this into the branches of the if statement? parser.getCurrrentBuffer() creates a copy. Calling it when the result is unused is wasteful and probably has a pretty big performance impact.

Copy link
Copy Markdown
Contributor Author

@XadillaX XadillaX Dec 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But if we don't get the buffer, we cannot pass it to the clientError event.


if (ret instanceof Error) {
ret.rawPacket = d || parser.getCurrentBuffer();
ret.rawPacket = d;
debug('parse error', ret);
socketOnError.call(socket, ret);
} else if (parser.incoming && parser.incoming.upgrade) {
Expand All @@ -485,9 +488,6 @@ function onParserExecuteCommon(server, socket, parser, state, ret, d) {
var req = parser.incoming;
debug('SERVER upgrade or connect', req.method);

if (!d)
d = parser.getCurrentBuffer();

socket.removeListener('data', state.onData);
socket.removeListener('end', state.onEnd);
socket.removeListener('close', state.onClose);
Expand Down