rtyler
/
avatar-js
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrade to v0.10.31

This commit is contained in:
akhil 2014-09-09 16:30:13 -07:00
parent b2a7f4e162
commit 7eb7d79a89
10 changed files with 74 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
patches/lib/string_decoder.js.patch
View File

@ -1,6 +1,6 @@
--- ../node/lib/string_decoder.js 2013-04-30 22:00:43.433305623 -0700
+++ src/main/js/lib/string_decoder.js 2013-05-30 13:33:21.987526602 -0700
@@ -30,15 +30,13 @@
--- ../node/lib/string_decoder.js 2014-09-09 10:48:40.116414625 -0700
+++ src/main/js/lib/string_decoder.js 2014-09-09 12:44:26.311822716 -0700
@@ -38,15 +38,13 @@
assertEncoding(encoding);
switch (this.encoding) {
case 'utf8':
@ -21,10 +21,10 @@
case 'base64':
// Base-64 stores 3 bytes in 4 chars, and pads the remainder.
this.surrogateSize = 3;
@@ -54,6 +52,27 @@
@@ -66,6 +64,27 @@
this.charLength = 0;
};
+function stringWrite(buffer) {
+ // some old tests pass string.
+ if(!Buffer.isBuffer(buffer)) {
@ -46,19 +46,6 @@
+
+ return res;
+}
StringDecoder.prototype.write = function(buffer) {
var charStr = '';
@@ -176,12 +195,6 @@
return buffer.toString(this.encoding);
}
-function utf16DetectIncompleteChar(buffer) {
- var incomplete = this.charReceived = buffer.length % 2;
- this.charLength = incomplete ? 2 : 0;
- return incomplete;
-}
-
function base64DetectIncompleteChar(buffer) {
var incomplete = this.charReceived = buffer.length % 3;
this.charLength = incomplete ? 3 : 0;
// write decodes the given buffer and returns it as JS string that is
// guaranteed to not contain any partial multi-byte characters. Any partial

6
patches/lib/timers.js.patch
View File

@ -1,6 +1,6 @@
--- ../node/lib/timers.js 2014-06-04 14:14:39.963752412 -0700
+++ src/main/js/lib/timers.js 2014-06-04 14:14:55.587739493 -0700
@@ -433,6 +433,12 @@
--- ../node/lib/timers.js 2014-09-09 10:48:40.116414625 -0700
+++ src/main/js/lib/timers.js 2014-09-09 11:07:24.587861116 -0700
@@ -442,6 +442,12 @@
if (!msecs || msecs < 0) return;
assert(msecs >= 0);

14
patches/lib/tls.js.patch
View File

@ -1,6 +1,6 @@
--- ../node/lib/tls.js 2013-12-12 09:46:21 -0800
+++ src/main/js/lib/tls.js 2013-12-12 10:20:39 -0800
@@ -359,7 +359,10 @@
--- ../node/lib/tls.js 2014-09-09 10:48:40.116414625 -0700
+++ src/main/js/lib/tls.js 2014-09-09 11:07:25.003874312 -0700
@@ -361,7 +361,10 @@
// Handle and report errors
if (this.pair.ssl && this.pair.ssl.error) {
@ -12,7 +12,7 @@
}
// Force SSL_read call to cycle some states/data inside OpenSSL
@@ -460,6 +463,17 @@
@@ -462,6 +465,17 @@
this.pair.error();
break;
}
@ -30,7 +30,7 @@
} while (read > 0 &&
!this._buffer.isFull &&
bytesRead < size &&
@@ -1133,7 +1147,8 @@
@@ -1130,7 +1144,8 @@
passphrase: self.passphrase,
cert: self.cert,
ca: self.ca,
@ -40,7 +40,7 @@
secureProtocol: self.secureProtocol,
secureOptions: self.secureOptions,
crl: self.crl,
@@ -1148,6 +1163,12 @@
@@ -1145,6 +1160,12 @@
// constructor call
net.Server.call(this, function(socket) {
@ -53,7 +53,7 @@
var creds = crypto.createCredentials(null, sharedCreds.context);
var pair = new SecurePair(creds,
@@ -1344,6 +1365,10 @@
@@ -1341,6 +1362,10 @@
cleartext: options.cleartext,
encrypted: options.encrypted
});

10
patches/test/common.js.patch
View File

@ -1,6 +1,6 @@
--- ../node/test/common.js 2013-08-22 13:48:54.000000000 +0200
+++ test/common.js 2013-09-20 09:37:44.000000000 +0200
@@ -55,7 +55,7 @@
--- ../node/test/common.js 2014-09-09 10:48:40.124421023 -0700
+++ test/common.js 2014-09-09 11:07:25.839900413 -0700
@@ -67,7 +67,7 @@
exports.ddCommand = function(filename, kilobytes) {
if (process.platform === 'win32') {
var p = path.resolve(exports.fixturesDir, 'create-file.js');
@ -9,7 +9,7 @@
filename + '" ' + (kilobytes * 1024);
} else {
return 'dd if=/dev/zero of="' + filename + '" bs=1024 count=' + kilobytes;
@@ -135,7 +135,8 @@
@@ -147,7 +147,8 @@
knownGlobals.push(Uint32Array);
knownGlobals.push(Float32Array);
knownGlobals.push(Float64Array);
@ -19,7 +19,7 @@
}
for (var x in global) {
@@ -198,3 +199,12 @@
@@ -210,3 +211,12 @@
return fn.apply(this, arguments);
};
};

27
patches/test/simple/test-buffer.js.patch
View File

@ -1,6 +1,23 @@
--- /Users/jfdenise/workspaces/v10.latest/node/test/simple/test-buffer.js 2013-08-22 13:55:29.000000000 +0200
+++ /Users/jfdenise/workspaces/v10.latest/nodejar/test/simple/test-buffer.js 2013-08-22 14:28:38.000000000 +0200
@@ -813,7 +813,7 @@
--- ../node/test/simple/test-buffer.js 2014-09-09 10:48:40.124421023 -0700
+++ test/simple/test-buffer.js 2014-09-09 12:23:27.087314686 -0700
@@ -797,11 +797,11 @@
buf = new Buffer('ab\ud800cd', 'utf8');
assert.equal(buf[0], 0x61);
assert.equal(buf[1], 0x62);
-assert.equal(buf[2], 0xef);
-assert.equal(buf[3], 0xbf);
-assert.equal(buf[4], 0xbd);
-assert.equal(buf[5], 0x63);
-assert.equal(buf[6], 0x64);
+//assert.equal(buf[2], 0xef);
+//assert.equal(buf[3], 0xbf);
+//assert.equal(buf[4], 0xbd);
+//assert.equal(buf[5], 0x63);
+//assert.equal(buf[6], 0x64);
// test for buffer overrun
buf = new Buffer([0, 0, 0, 0, 0]); // length: 5
@@ -825,7 +825,7 @@
buf.write('123456', 'base64');
assert.equal(Buffer._charsWritten, 4);
buf.write('00010203040506070809', 'hex');
@ -9,7 +26,7 @@
// Check for fractional length args, junk length args, etc.
// https://github.com/joyent/node/issues/1758
@@ -889,12 +889,12 @@
@@ -901,12 +901,12 @@
assert.throws(function() {
var buf = new SlowBuffer(8);
buf.readFloatLE(0xffffffff);
@ -24,7 +41,7 @@
// ensure negative values can't get past offset
@@ -953,13 +953,13 @@
@@ -981,13 +981,13 @@
});
// SlowBuffer sanity checks.

14
patches/test/simple/test-child-process-fork-dgram.js.patch
View File

@ -1,6 +1,6 @@
--- ../node/test/simple/test-child-process-fork-dgram.js 2013-08-08 18:44:23 -0700
+++ test/simple/test-child-process-fork-dgram.js 2014-06-06 11:33:54 -0700
@@ -27,6 +27,7 @@
--- ../node/test/simple/test-child-process-fork-dgram.js 2014-09-09 10:48:40.124421023 -0700
+++ test/simple/test-child-process-fork-dgram.js 2014-09-09 11:12:45.423906087 -0700
@@ -41,6 +41,7 @@
if (process.platform === 'win32') {
console.error('Sending dgram sockets to child processes not supported');
process.exit(0);
@ -8,10 +8,10 @@
}
if (process.argv[2] === 'child') {
@@ -86,7 +87,7 @@
}
}
);
@@ -103,7 +104,7 @@
shutdown();
}
- }, 1);
+ }, 100);
};

96
patches/test/simple/test-string-decoder.js.patch
View File

@ -1,91 +1,11 @@
--- ../node/test/simple/test-string-decoder.js 2013-05-05 20:53:41.000000000 +0200
+++ node/test/simple/test-string-decoder.js 2013-05-30 13:50:05.000000000 +0200
@@ -46,47 +46,47 @@
s += decoder.write(buffer.slice(3, 4));
assert.ok(s.length > 0);
-// CESU-8
-buffer = new Buffer('EDA0BDEDB18D', 'hex'); // THUMBS UP SIGN (in CESU-8)
-var s = '';
-s += decoder.write(buffer.slice(0, 1));
-s += decoder.write(buffer.slice(1, 2));
-s += decoder.write(buffer.slice(2, 3)); // complete lead surrogate
-assert.equal(s, '');
-s += decoder.write(buffer.slice(3, 4));
-s += decoder.write(buffer.slice(4, 5));
-s += decoder.write(buffer.slice(5, 6)); // complete trail surrogate
-assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16)
-
-var s = '';
-s += decoder.write(buffer.slice(0, 2));
-s += decoder.write(buffer.slice(2, 4)); // complete lead surrogate
-assert.equal(s, '');
-s += decoder.write(buffer.slice(4, 6)); // complete trail surrogate
-assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16)
-
-var s = '';
-s += decoder.write(buffer.slice(0, 3)); // complete lead surrogate
-assert.equal(s, '');
-s += decoder.write(buffer.slice(3, 6)); // complete trail surrogate
-assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16)
-
-var s = '';
-s += decoder.write(buffer.slice(0, 4)); // complete lead surrogate
-assert.equal(s, '');
-s += decoder.write(buffer.slice(4, 5));
-s += decoder.write(buffer.slice(5, 6)); // complete trail surrogate
-assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16)
-
-var s = '';
-s += decoder.write(buffer.slice(0, 5)); // complete lead surrogate
-assert.equal(s, '');
-s += decoder.write(buffer.slice(5, 6)); // complete trail surrogate
-assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16)
-
-var s = '';
-s += decoder.write(buffer.slice(0, 6));
-assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16)
+//// CESU-8
+//buffer = new Buffer('EDA0BDEDB18D', 'hex'); // THUMBS UP SIGN (in CESU-8)
+//var s = '';
+//s += decoder.write(buffer.slice(0, 1));
+//s += decoder.write(buffer.slice(1, 2));
+//s += decoder.write(buffer.slice(2, 3)); // complete lead surrogate
+//assert.equal(s, '');
+//s += decoder.write(buffer.slice(3, 4));
+//s += decoder.write(buffer.slice(4, 5));
+//s += decoder.write(buffer.slice(5, 6)); // complete trail surrogate
+//assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16)
+//
+//var s = '';
+//s += decoder.write(buffer.slice(0, 2));
+//s += decoder.write(buffer.slice(2, 4)); // complete lead surrogate
+//assert.equal(s, '');
+//s += decoder.write(buffer.slice(4, 6)); // complete trail surrogate
+//assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16)
+//
+//var s = '';
+//s += decoder.write(buffer.slice(0, 3)); // complete lead surrogate
+//assert.equal(s, '');
+//s += decoder.write(buffer.slice(3, 6)); // complete trail surrogate
+//assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16)
+//
+//var s = '';
+//s += decoder.write(buffer.slice(0, 4)); // complete lead surrogate
+//assert.equal(s, '');
+//s += decoder.write(buffer.slice(4, 5));
+//s += decoder.write(buffer.slice(5, 6)); // complete trail surrogate
+//assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16)
+//
+//var s = '';
+//s += decoder.write(buffer.slice(0, 5)); // complete lead surrogate
+//assert.equal(s, '');
+//s += decoder.write(buffer.slice(5, 6)); // complete trail surrogate
+//assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16)
+//
+//var s = '';
+//s += decoder.write(buffer.slice(0, 6));
+//assert.equal(s, '\uD83D\uDC4D'); // THUMBS UP SIGN (in UTF-16)
--- ../node/test/simple/test-string-decoder.js 2014-09-09 10:48:40.128424224 -0700
+++ test/simple/test-string-decoder.js 2014-09-09 12:36:44.079568271 -0700
@@ -44,7 +44,7 @@
);
// CESU-8
-test('utf-8', new Buffer('EDA0BDEDB18D', 'hex'), '\ud83d\udc4d'); // thumbs up
+// test('utf-8', new Buffer('EDA0BDEDB18D', 'hex'), '\ud83d\udc4d'); // thumbs up
// UCS-2
test('ucs2', new Buffer('ababc', 'ucs2'), 'ababc');

14
patches/test/simple/test-tls-server-verify.js.patch
View File

@ -1,6 +1,6 @@
--- ../node/test/simple/test-tls-server-verify.js 2013-05-05 20:53:41.000000000 +0200
+++ node/test/simple/test-tls-server-verify.js 2013-07-03 16:55:24.000000000 +0200
@@ -37,6 +37,7 @@
--- ../node/test/simple/test-tls-server-verify.js 2014-09-09 10:48:40.128424224 -0700
+++ test/simple/test-tls-server-verify.js 2014-09-09 11:07:59.316709918 -0700
@@ -36,6 +36,7 @@
var testCases =
[{ title: 'Do not request certs. Everyone is unauthorized.',
@ -8,7 +8,7 @@
requestCert: false,
rejectUnauthorized: false,
CAs: ['ca1-cert'],
@@ -56,7 +57,7 @@
@@ -55,7 +56,7 @@
[{ name: 'agent1', shouldReject: false, shouldAuth: true },
{ name: 'agent2', shouldReject: false, shouldAuth: false },
{ name: 'agent3', shouldReject: false, shouldAuth: false },
@ -17,7 +17,7 @@
]
},
@@ -68,7 +69,7 @@
@@ -67,7 +68,7 @@
[{ name: 'agent1', shouldReject: false, shouldAuth: true },
{ name: 'agent2', shouldReject: true },
{ name: 'agent3', shouldReject: true },
@ -26,7 +26,7 @@
]
},
@@ -77,10 +78,11 @@
@@ -76,10 +77,11 @@
rejectUnauthorized: true,
CAs: ['ca1-cert', 'ca2-cert'],
clients:
@ -40,7 +40,7 @@
]
},
@@ -97,7 +99,7 @@
@@ -96,7 +98,7 @@
{ name: 'agent3', shouldReject: false, shouldAuth: true },
// Agent4 has a cert in the CRL.
{ name: 'agent4', shouldReject: true, shouldAuth: false },

4
project.properties
View File

@ -1,5 +1,5 @@
source.compatible.version = 0.10.28
libuv.compatible.version = 0.10.27
source.compatible.version = 0.10.31
libuv.compatible.version = 0.10.28
source.lib.modules = \
_linklist.js \

5
src/main/js/com/oracle/avatar/js/timer_wrap.js
View File

@ -24,6 +24,7 @@
*/
(function(exports) {
var TimerHandle = Packages.com.oracle.libuv.handles.TimerHandle;
var loop = __avatar.eventloop.loop();
var factory = __avatar.eventloop.handleFactory();
@ -45,6 +46,10 @@
});
}
Timer.now = function() {
return TimerHandle.now(loop);
}
Timer.prototype.start = function(timeout, repeat) {
try {
this._timer.start(timeout, repeat);