Skip to content

Commit d3a822a

Browse files
authored
http: close pre-request sockets in closeIdleConnections
Signed-off-by: semimikoh <ejffjeosms@gmail.com> PR-URL: #63470 Fixes: #63452 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day> Reviewed-By: Tim Perry <pimterry@gmail.com>
1 parent 26f6c76 commit d3a822a

2 files changed

Lines changed: 27 additions & 1 deletion

File tree

src/node_http_parser.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ class Parser : public AsyncWrap, public StreamListener {
318318
num_fields_ = num_values_ = 0;
319319
headers_completed_ = false;
320320
chunk_extensions_nread_ = 0;
321+
received_data_ = true;
321322
last_message_start_ = uv_hrtime();
322323
allocator_.Reset();
323324
url_.Reset();
@@ -724,6 +725,7 @@ class Parser : public AsyncWrap, public StreamListener {
724725

725726
if (connectionsList != nullptr) {
726727
parser->connectionsList_ = connectionsList;
728+
parser->received_data_ = false;
727729

728730
// This protects from a DoS attack where an attacker establishes
729731
// the connection without sending any data on applications where
@@ -1070,6 +1072,7 @@ class Parser : public AsyncWrap, public StreamListener {
10701072
const char* current_buffer_data_;
10711073
bool headers_completed_ = false;
10721074
bool pending_pause_ = false;
1075+
bool received_data_ = false;
10731076
uint64_t header_nread_ = 0;
10741077
uint64_t chunk_extensions_nread_ = 0;
10751078
uint64_t max_http_header_size_;
@@ -1150,7 +1153,7 @@ void ConnectionsList::Idle(const FunctionCallbackInfo<Value>& args) {
11501153
LocalVector<Value> result(isolate);
11511154
result.reserve(list->all_connections_.size());
11521155
for (auto parser : list->all_connections_) {
1153-
if (parser->last_message_start_ == 0) {
1156+
if (parser->last_message_start_ == 0 || !parser->received_data_) {
11541157
result.emplace_back(parser->object());
11551158
}
11561159
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
'use strict';
2+
3+
const common = require('../common');
4+
5+
const { createServer } = require('http');
6+
const { createConnection } = require('net');
7+
8+
const server = createServer(common.mustNotCall());
9+
10+
server.listen(0, '127.0.0.1', common.mustCall(() => {
11+
const port = server.address().port;
12+
server.once('connection', common.mustCall(() => {
13+
server.close(common.mustCall());
14+
server.closeIdleConnections();
15+
setTimeout(common.mustNotCall(), common.platformTimeout(1000)).unref();
16+
}));
17+
18+
const socket = createConnection(port, '127.0.0.1');
19+
20+
socket.on('connect', common.mustCall());
21+
socket.on('close', common.mustCall());
22+
socket.on('error', () => {});
23+
}));

0 commit comments

Comments
 (0)