OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2026-01-15 12:15:26 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

process: add process.features, remove process.useUV

Browse Source 
Partially fixes #1385.
This commit is contained in:
Ben Noordhuis
2011-07-23 23:16:48 +02:00
parent 50e147bd03
commit aa0308d618
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/node.cc
View File

@@ -2013,6 +2013,19 @@ static Handle<Array> EnvEnumerator(const AccessorInfo& info) {
}
static Handle<Object> GetFeatures() {
HandleScope scope;
Local<Object> obj = Object::New();
obj->Set(String::NewSymbol("uv"), Boolean::New(use_uv));
obj->Set(String::NewSymbol("ipv6"), True()); // TODO ping libuv
obj->Set(String::NewSymbol("tls"),
Boolean::New(get_builtin_module("crypto") != NULL));
return scope.Close(obj);
}
Handle<Object> SetupProcessObject(int argc, char *argv[]) {
HandleScope scope;
@@ -2102,7 +2115,7 @@ Handle<Object> SetupProcessObject(int argc, char *argv[]) {
process->Set(String::NewSymbol("ENV"), ENV);
process->Set(String::NewSymbol("pid"), Integer::New(getpid()));
process->Set(String::NewSymbol("useUV"), use_uv ? True() : False());
process->Set(String::NewSymbol("features"), GetFeatures());
// -e, --eval
if (eval_string) {

8
src/node.js
View File

@@ -31,7 +31,7 @@
function startup() {
if (process.env.NODE_USE_UV == '1') process.useUV = true;
if (process.env.NODE_USE_UV == '1') process.features.uv = true;
EventEmitter = NativeModule.require('events').EventEmitter;
process.__proto__ = EventEmitter.prototype;
@@ -389,13 +389,13 @@
function translateId(id) {
switch (id) {
case 'net':
return process.useUV ? 'net_uv' : 'net_legacy';
return process.features.uv ? 'net_uv' : 'net_legacy';
case 'timers':
return process.useUV ? 'timers_uv' : 'timers_legacy';
return process.features.uv ? 'timers_uv' : 'timers_legacy';
case 'dns':
return process.useUV ? 'dns_uv' : 'dns_legacy';
return process.features.uv ? 'dns_uv' : 'dns_legacy';
default:
return id;

2
test/internet/test-dns.js
View File

@@ -25,7 +25,7 @@ var assert = require('assert');
isIP = net.isIP,
isIPv4 = net.isIPv4,
isIPv6 = net.isIPv6,
uv = process.useUV;
uv = process.features.uv;
var expected = 0,
completed = 0,