Skip to content
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

Jump to bottom

http_server: fix resume after socket close #2824

Closed
wants to merge 3 commits into from
Closed

http_server: fix resume after socket close #2824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93436ab
http_server: fix resume after socket close
indutny Sep 11, 2015
214ed2e
...
indutny Sep 11, 2015
5fe0449
...
indutny Sep 11, 2015
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
8 changes: 5 additions & 3 deletions lib/_http_server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,11 +512,13 @@ function connectionListener(socket) {
exports._connectionListener = connectionListener;

function onSocketResume() {
this._handle.readStart();
if (this._handle)
this._handle.readStart();
}

function onSocketPause() {
this._handle.readStop();
if (this._handle)
this._handle.readStop();
}

function socketOnWrap(ev, fn) {
Expand All @@ -526,7 +528,7 @@ function socketOnWrap(ev, fn) {
return res;
}

if (ev === 'data' || ev === 'readable')
if (this._handle && (ev === 'data' || ev === 'readable'))
this.parser.unconsume(this._handle._externalStream);

return res;
Expand Down
24 changes: 24 additions & 0 deletions test/parallel/test-http-regr-gh-2821.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const http = require('http');

const server = http.createServer(function(req, res) {
res.writeHead(200);
res.end();

server.close();
});

server.listen(common.PORT, function() {

const req = http.request({
method: 'POST',
port: common.PORT
});

const payload = new Buffer(16390);
Copy link
Member

Choose a reason for hiding this comment

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

Can you fill it with something, please? I would prefer if random memory regions were not passed through the network stack, even in the harmless tests.

Copy link
Member Author

Choose a reason for hiding this comment

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

Here you go, not sure how relevant it was, though ;)

Copy link
Member

Choose a reason for hiding this comment

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

The same applies to other tests — some of them fill buffers, some don't. But that is out of scope for now.

Copy link
Member

Choose a reason for hiding this comment

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

@indutny Thanks!

payload.fill('Й');
req.write(payload);
req.end();
});