[6.x] http: make socketPath work with no agent #19425
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Not sure if it's ok to apply bug fixes directly on v6.x but master and v8.x are not affected by this bug. |
lpinca
force-pushed
the
fix/socket-path-with-no-agent
branch
from
da5c658
to
26e2a50
Compare
mscdex
reviewed
Mar 18, 2018
lib/_http_client.js
Outdated
| ? self.agent.createConnection(optionsPath, oncreate) | ||
| : typeof options.createConnection === 'function' | ||
| ? options.createConnection(optionsPath, oncreate) | ||
| : net.createConnection(optionsPath, oncreate); |
There was a problem hiding this comment.
We don't need to pass oncreate to net.createConnection(), it always immediately returns a socket.
|
bug fixes against a direct release branch are fine if other branches are unaffects /cc @nodejs/lts for review |
MylesBorins
changed the title
lpinca
force-pushed
the
fix/socket-path-with-no-agent
branch
from
f6a2de7
to
e507d01
Compare
3 tasks
|
/cc @nodejs/http |
MylesBorins
force-pushed
the
v6.x-staging
branch
2 times, most recently
from
0a4c79b
to
988cca8
Compare
Currently `Agent.prototype.createConnection()` is called uncoditionally if the `socketPath` option is used. This throws an error if no agent is used, preventing, for example, the `socketPath` and `createConnection` options to be used together. This commit fixes the issue by falling back to the `createConnection` option or `net.createConnection()`.
lpinca
force-pushed
the
fix/socket-path-with-no-agent
branch
from
e507d01
to
6cc1820
Compare
|
Ping @nodejs/collaborators |
rvagg
approved these changes
Apr 6, 2018
mmarchini
approved these changes
Apr 12, 2018
MoonBall
approved these changes
Apr 13, 2018
MylesBorins
pushed a commit
that referenced
this pull request
Apr 13, 2018
Currently `Agent.prototype.createConnection()` is called uncoditionally if the `socketPath` option is used. This throws an error if no agent is used, preventing, for example, the `socketPath` and `createConnection` options to be used together. This commit fixes the issue by falling back to the `createConnection` option or `net.createConnection()`. PR-URL: #19425 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Matheus Marchini <matheus@sthima.com> Reviewed-By: Chen Gang <gangc.cxy@foxmail.com>
|
landed in 18acad3 |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently
Agent.prototype.createConnection()is called uncoditionallyif the
socketPathoption is used. This throws an error if no agent isused, preventing, for example, the
socketPathandcreateConnectionoptions to be used together.
This commit fixes the issue by falling back to the
createConnectionoption or
net.createConnection().Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passes