Skip to content

Commit 4f71f9f

Browse files
committed
http: fixed invalid path with connect method
Fixes: nodejs#34347
1 parent 08e8997 commit 4f71f9f

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

‎lib/_http_client.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const Agent = require('_http_agent');
4949
const { Buffer } = require('buffer');
5050
const { defaultTriggerAsyncIdScope } = require('internal/async_hooks');
5151
const { URL, urlToOptions, searchParamsSymbol } = require('internal/url');
52-
const { kOutHeaders, kNeedDrain } = require('internal/http');
52+
const { kOutHeaders, kNeedDrain, kClosed } = require('internal/http');
5353
const { connResetException, codes } = require('internal/errors');
5454
const {
5555
ERR_HTTP_HEADERS_SENT,
@@ -197,6 +197,8 @@ function ClientRequest(input, options, cb) {
197197
}
198198
this.insecureHTTPParser = insecureHTTPParser;
199199

200+
options.path = method === 'CONNECT' && options.path.charAt(0) === '/' ?
201+
options.path.slice(1) : options.path;
200202
this.path = options.path || '/';
201203
if (cb) {
202204
this.once('response', cb);
@@ -387,7 +389,7 @@ function _destroy(req, socket, err) {
387389
if (err) {
388390
req.emit('error', err);
389391
}
390-
req._closed = true;
392+
req[kClosed] = true;
391393
req.emit('close');
392394
}
393395
}
@@ -430,7 +432,7 @@ function socketCloseListener() {
430432
res.emit('error', connResetException('aborted'));
431433
}
432434
}
433-
req._closed = true;
435+
req[kClosed] = true;
434436
req.emit('close');
435437
if (!res.aborted && res.readable) {
436438
res.on('end', function() {
@@ -450,7 +452,7 @@ function socketCloseListener() {
450452
req.socket._hadError = true;
451453
req.emit('error', connResetException('socket hang up'));
452454
}
453-
req._closed = true;
455+
req[kClosed] = true;
454456
req.emit('close');
455457
}
456458

@@ -555,7 +557,7 @@ function socketOnData(d) {
555557

556558
req.emit(eventName, res, socket, bodyHead);
557559
req.destroyed = true;
558-
req._closed = true;
560+
req[kClosed] = true;
559561
req.emit('close');
560562
} else {
561563
// Requested Upgrade or used CONNECT method, but have no handler.
@@ -727,7 +729,7 @@ function requestOnPrefinish() {
727729
}
728730

729731
function emitFreeNT(req) {
730-
req._closed = true;
732+
req[kClosed] = true;
731733
req.emit('close');
732734
if (req.res) {
733735
req.res.emit('close');

0 commit comments

Comments
 (0)