upgrade to 0.10.28 (latest stable)

This commit is contained in:
akhil 2014-06-04 16:19:30 -07:00
parent bf44656e08
commit c5774fc99e
8 changed files with 59 additions and 48 deletions

View File

@ -3,7 +3,7 @@ Build Instructions
1. Setup build environment. Install a git client, jdk8, ant, python, C++ compiler and linker
1. Install the latest [jdk8](http://jdk8.java.net/download.html)
1. Install the latest [jdk8u20](http://jdk8.java.net/download.html)
2. Ensure [ant](http://ant.apache.org/) is installed and `ant -version` is _1.8_+
3. Ensure [python](http://python.org/) is installed and `python --version` is _2.7.5_+ <br/>
_tip_: __python3__ does __not__ work
@ -25,7 +25,7 @@ Build Instructions
1. `git clone https://github.com/joyent/node.git source`
2. `cd source`
3. `git checkout v0.10.25` <br/>
3. `git checkout v0.10.28` <br/>
_tip_: run `git pull` to refresh the repo if you get an error saying that this version is unknown
4. `cd ..`
@ -98,7 +98,7 @@ Build Instructions
Release Notes
=============
+ Compatible with Node.js v0.10.25
+ Compatible with Node.js v0.10.28
+ Platforms tested. 32-bit variants have not been tested _at all_
+ Ubuntu Linux x64

View File

@ -319,7 +319,6 @@
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-http-client-timeout-event.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-http-default-encoding.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-http-end-throw-socket-handling.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-http-many-ended-pipelines.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-http-many-keep-alive-connections.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-http-pipeline-flood.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-https-strict.js"/>
@ -428,7 +427,6 @@
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-http-client-timeout-event.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-http-default-encoding.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-http-end-throw-socket-handling.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-http-many-ended-pipelines.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-http-many-keep-alive-connections.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-http-pipeline-flood.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-https-strict.js"/>

View File

@ -1,12 +1,12 @@
--- ../node/lib/http.js 2013-12-06 15:13:27.999097695 -0800
+++ src/main/js/lib/http.js 2013-12-06 15:25:00.781739221 -0800
@@ -1008,12 +1008,12 @@
--- ../node/lib/http.js 2014-06-04 14:14:39.963752412 -0700
+++ src/main/js/lib/http.js 2014-06-04 14:17:33.096035686 -0700
@@ -1006,12 +1006,12 @@
OutgoingMessage.prototype._finish = function() {
assert(this.connection);
if (this instanceof ServerResponse) {
- DTRACE_HTTP_SERVER_RESPONSE(this.connection);
- COUNTER_HTTP_SERVER_RESPONSE();
+ // DTRACE_HTTP_SERVER_RESPONSE(this.connection);
+ // DTRACE_HTTP_SERVER_RESPONSE(this.connection);
+ // COUNTER_HTTP_SERVER_RESPONSE();
} else {
assert(this instanceof ClientRequest);

View File

@ -1,6 +1,6 @@
--- ../node/lib/net.js 2014-01-27 14:53:21 -0800
+++ src/main/js/lib/net.js 2014-01-27 14:53:47 -0800
@@ -396,7 +396,7 @@
--- ../node/lib/net.js 2014-06-04 14:14:39.963752412 -0700
+++ src/main/js/lib/net.js 2014-06-04 14:14:54.327740417 -0700
@@ -395,7 +395,7 @@
Socket.prototype.end = function(data, encoding) {
stream.Duplex.prototype.end.call(this, data, encoding);
this.writable = false;
@ -9,8 +9,8 @@
// just in case we're waiting for an EOF.
if (this.readable && !this._readableState.endEmitted)
@@ -473,7 +473,7 @@
this.destroyed = true;
@@ -475,7 +475,7 @@
fireErrorCallbacks();
if (this.server) {
- COUNTER_NET_SERVER_CONNECTION_CLOSE(this);
@ -18,7 +18,7 @@
debug('has server');
this.server._connections--;
if (this.server._emitCloseIfDrained) {
@@ -1183,8 +1183,8 @@
@@ -1186,8 +1186,8 @@
self._connections++;
socket.server = self;

View File

@ -1,6 +1,6 @@
--- ../node/lib/timers.js 2013-09-09 09:17:34.999854126 -0700
+++ src/main/js/lib/timers.js 2014-05-22 18:10:51.568306098 -0700
@@ -427,6 +427,12 @@
--- ../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 @@
if (!msecs || msecs < 0) return;
assert(msecs >= 0);

View File

@ -1,5 +1,5 @@
--- /Users/jfdenise/workspaces/v10.latest/node/test/simple/test-crypto.js 2013-08-22 13:55:29.000000000 +0200
+++ /Users/jfdenise/workspaces/v10.latest/nodejar/test/crypto/test-crypto.js 2013-08-29 13:01:00.000000000 +0200
--- ../node/test/simple/test-crypto.js 2014-06-04 14:14:39.975752401 -0700
+++ test/crypto/test-crypto.js 2014-06-04 16:04:36.042723676 -0700
@@ -672,7 +672,7 @@
// Test Diffie-Hellman with two parties sharing a secret,
@ -29,7 +29,7 @@
})();
// Create a shared using a DH group.
@@ -857,14 +857,15 @@
@@ -857,17 +857,18 @@
// Assume that we have at least AES256-SHA.
var tls = require('tls');
assert.notEqual(0, tls.getCiphers().length);
@ -47,8 +47,12 @@
+//assert.notEqual(-1, crypto.getHashes().indexOf('sha'));
assert.equal(-1, crypto.getHashes().indexOf('SHA1'));
assert.equal(-1, crypto.getHashes().indexOf('SHA'));
-assert.notEqual(-1, crypto.getHashes().indexOf('RSA-SHA1'));
+//assert.notEqual(-1, crypto.getHashes().indexOf('RSA-SHA1'));
assert.equal(-1, crypto.getHashes().indexOf('rsa-sha1'));
assertSorted(crypto.getHashes());
@@ -873,14 +874,16 @@
@@ -875,14 +876,16 @@
(function() {
var c = crypto.createCipher('aes-256-cbc', 'secret');
var s = c.update('test', 'utf8', 'base64') + c.final('base64');
@ -67,36 +71,60 @@
// Calling Cipher.final() or Decipher.final() twice should error but
// not assert. See #4886.
(function() {
@@ -920,20 +923,22 @@
@@ -922,33 +925,33 @@
// throw, not assert in C++ land.
assert.throws(function() {
crypto.createCipher('aes192', 'test').update('0', 'hex');
-}, /Bad input string/);
+}, /odd number of hex digits/);
+}, /odd number of hex digits found/);
assert.throws(function() {
crypto.createDecipher('aes192', 'test').update('0', 'hex');
-}, /Bad input string/);
+}, /odd number of hex digits/);
+}, /odd number of hex digits found/);
assert.throws(function() {
crypto.createHash('sha1').update('0', 'hex');
-}, /Bad input string/);
+}, /odd number of hex digits/);
-
-assert.throws(function() {
- crypto.createSign('RSA-SHA1').update('0', 'hex');
-}, /Bad input string/);
-
+}, /odd number of hex digits found/);
-assert.throws(function() {
- crypto.createVerify('RSA-SHA1').update('0', 'hex');
-}, /Bad input string/);
+// Would fail on sign
-
-assert.throws(function() {
- var private = [
- '-----BEGIN RSA PRIVATE KEY-----',
- 'MIGrAgEAAiEA+3z+1QNF2/unumadiwEr+C5vfhezsb3hp4jAnCNRpPcCAwEAAQIgQNriSQK4',
- 'EFwczDhMZp2dvbcz7OUUyt36z3S4usFPHSECEQD/41K7SujrstBfoCPzwC1xAhEA+5kt4BJy',
- 'eKN7LggbF3Dk5wIQN6SL+fQ5H/+7NgARsVBp0QIRANxYRukavs4QvuyNhMx+vrkCEQCbf6j/',
- 'Ig6/HueCK/0Jkmp+',
- '-----END RSA PRIVATE KEY-----',
- ''
- ].join('\n');
- crypto.createSign('RSA-SHA256').update('test').sign(private);
-}, /SignFinal/);
+//assert.throws(function() {
+// crypto.createSign('RSA-SHA1').update('0', 'hex');
+//}, /Bad input string/);
+
+// Would fail on sign
+//
+//assert.throws(function() {
+// crypto.createVerify('RSA-SHA1').update('0', 'hex');
+//}, /Bad input string/);
+
+//assert.throws(function() {
+// var private = [
+// '-----BEGIN RSA PRIVATE KEY-----',
+// 'MIGrAgEAAiEA+3z+1QNF2/unumadiwEr+C5vfhezsb3hp4jAnCNRpPcCAwEAAQIgQNriSQK4',
+// 'EFwczDhMZp2dvbcz7OUUyt36z3S4usFPHSECEQD/41K7SujrstBfoCPzwC1xAhEA+5kt4BJy',
+// 'eKN7LggbF3Dk5wIQN6SL+fQ5H/+7NgARsVBp0QIRANxYRukavs4QvuyNhMx+vrkCEQCbf6j/',
+// 'Ig6/HueCK/0Jkmp+',
+// '-----END RSA PRIVATE KEY-----',
+// ''
+// ].join('\n');
+// crypto.createSign('RSA-SHA256').update('test').sign(private);
+//}, /SignFinal/);

View File

@ -1,15 +0,0 @@
--- /Users/jfdenise/workspaces/v10.latest/node/test/simple/test-http-many-ended-pipelines.js 2013-08-22 13:48:54.000000000 +0200
+++ /Users/jfdenise/workspaces/v10.latest/nodejar/test/simple/test-http-many-ended-pipelines.js 2013-08-28 15:22:42.000000000 +0200
@@ -51,4 +51,12 @@
client.on('connect', function() {
server.close();
});
+// On linux, we do get a ECONNRESET. This is time dependent
+// (If debug is enabled, we don't get the error).
+// When the socket is destroyed, such error is expected on the client side.
+// An error handler should have been set in the original test
+client.on('error', function(err) {
+ print("Destroying the socket can raisonably create read ECONNRESET");
+ assert.equal(err.code, "ECONNRESET");
+});
client.pipe(process.stdout);

View File

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