Skip to content

net: persist net.Socket options before connect #880

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

Closed
evanlucas wants to merge 15 commits into from
Closed

net: persist net.Socket options before connect #880

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e61ee49
Working on v2.0.0
chrisdickinson Apr 17, 2015
6870764
doc: update CONTRIBUTING.md
brendanashworth Apr 18, 2015
7180597
Revert "http: don't bother making a copy of the options"
brendanashworth Apr 18, 2015
6bf85bc
test: add test for 06cfff9 regression
brendanashworth Apr 18, 2015
59a5c98
Merge v1.8.1.
chrisdickinson Apr 21, 2015
2632775
doc: update AUTHORS list
rvagg Apr 20, 2015
b16a328
doc: add spaces to child.kill example
enaqx Apr 22, 2015
22aafa5
doc: add Fishrock123 to the TC
Fishrock123 Apr 23, 2015
a7d7463
tls_wrap: use localhost if options.host is empty
sitegui Apr 21, 2015
7384ca8
module: remove '' from Module.globalPaths
chrisyip Apr 21, 2015
bb254b5
doc: update branch to master
silverwind Apr 23, 2015
3d3083b
buffer: little improve for Buffer.concat method
JacksonTian Apr 16, 2015
1bef717
net: cleanup connect logic
evanlucas Apr 22, 2015
4abe2fa
net: add lookup option to Socket.prototype.connect
evanlucas Apr 22, 2015
102a993
net: persist net.Socket options before connect
evanlucas Feb 18, 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
Prev Previous commit
Next Next commit
module: remove '' from Module.globalPaths 
If `$NODE_PATH` contains trailing separators, `Module.globalPaths` will
contains empty strings. When `Module` try to resolve a module's path,
`path.resolve('', 'index.js')` will boil down to `$PWD/index.js`, which
makes sub modules can access global modules and get unexpected result.

PR-URL: #1488
Reviewed-By: Roman Reiss <me@silverwind.io>
  • Loading branch information
@chrisyip @silverwind
chrisyip authored and silverwind committed Apr 23, 2015
commit 7384ca83f97a28b0cecaabe879e9af0fe8631b62
4 changes: 3 additions & 1 deletion lib/module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,9 @@ Module._initPaths = function() {

var nodePath = process.env['NODE_PATH'];
if (nodePath) {
paths = nodePath.split(path.delimiter).concat(paths);
paths = nodePath.split(path.delimiter).filter(function(path) {
return !!path;
}).concat(paths);
}

modulePaths = paths;
Expand Down
8 changes: 5 additions & 3 deletions test/parallel/test-module-globalpaths-nodepath.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,22 @@ var module = require('module');
var isWindows = process.platform === 'win32';

var partA, partB;
var partC = '';

if (isWindows) {
partA = 'C:\\Users\\Rocko Artischocko\\AppData\\Roaming\\npm';
partB = 'C:\\Program Files (x86)\\nodejs\\';
process.env['NODE_PATH'] = partA + ';' + partB;
process.env['NODE_PATH'] = partA + ';' + partB + ';' + partC;
} else {
partA = '/usr/test/lib/node_modules';
partB = '/usr/test/lib/node';
process.env['NODE_PATH'] = partA + ':' + partB;
process.env['NODE_PATH'] = partA + ':' + partB + ':' + partC;
}

module._initPaths();

assert.ok(module.globalPaths.indexOf(partA) !== -1);
assert.ok(module.globalPaths.indexOf(partB) !== -1);
assert.ok(module.globalPaths.indexOf(partC) === -1);

assert.ok(Array.isArray(module.globalPaths));
assert.ok(Array.isArray(module.globalPaths));