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: fixed invalid path with connect method #34408

Closed
wants to merge 1 commit into from
Closed

http: fixed invalid path with connect method #34408

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions lib/_http_client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const Agent = require('_http_agent');
const { Buffer } = require('buffer');
const { defaultTriggerAsyncIdScope } = require('internal/async_hooks');
const { URL, urlToOptions, searchParamsSymbol } = require('internal/url');
const { kOutHeaders, kNeedDrain } = require('internal/http');
const { kOutHeaders, kNeedDrain, kClosed } = require('internal/http');
const { connResetException, codes } = require('internal/errors');
const {
ERR_HTTP_HEADERS_SENT,
Expand Down Expand Up @@ -197,6 +197,8 @@ function ClientRequest(input, options, cb) {
}
this.insecureHTTPParser = insecureHTTPParser;

options.path = method === 'CONNECT' && options.path.charAt(0) === '/' ?
options.path.slice(1) : options.path;
this.path = options.path || '/';
if (cb) {
this.once('response', cb);
Expand Down Expand Up @@ -387,7 +389,7 @@ function _destroy(req, socket, err) {
if (err) {
req.emit('error', err);
}
req._closed = true;
req[kClosed] = true;
Copy link
Member

Choose a reason for hiding this comment

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

This is not ok, see discussion on #34313.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This seems strange, I can't remember changing this part of the file however I will revert the changes for now and create another PR.

Copy link
Member

Choose a reason for hiding this comment

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

git pull --rebase

req.emit('close');
}
}
Expand Down Expand Up @@ -430,7 +432,7 @@ function socketCloseListener() {
res.emit('error', connResetException('aborted'));
}
}
req._closed = true;
req[kClosed] = true;
req.emit('close');
if (!res.aborted && res.readable) {
res.on('end', function() {
Expand All @@ -450,7 +452,7 @@ function socketCloseListener() {
req.socket._hadError = true;
req.emit('error', connResetException('socket hang up'));
}
req._closed = true;
req[kClosed] = true;
req.emit('close');
}

Expand Down Expand Up @@ -555,7 +557,7 @@ function socketOnData(d) {

req.emit(eventName, res, socket, bodyHead);
req.destroyed = true;
req._closed = true;
req[kClosed] = true;
req.emit('close');
} else {
// Requested Upgrade or used CONNECT method, but have no handler.
Expand Down Expand Up @@ -727,7 +729,7 @@ function requestOnPrefinish() {
}

function emitFreeNT(req) {
req._closed = true;
req[kClosed] = true;
req.emit('close');
if (req.res) {
req.res.emit('close');
Expand Down