upgrade to v0.10.21

This commit is contained in:
akhil 2013-12-06 16:06:41 -08:00
parent 1f85011893
commit 7e56c3f1b3
5 changed files with 18 additions and 18 deletions

2
README
View File

@ -8,7 +8,7 @@ Build Instructions
2. Download node.js
a) git clone https://github.com/joyent/node.git source
b) cd source
c) git checkout v0.10.18
c) git checkout v0.10.21
(do 'git pull' to refresh repo if you get an error saying this version is unknown)
3. Clone dependencies (<id> is your java.net id)

View File

@ -1,6 +1,6 @@
--- /Users/jfdenise/workspaces/v10.latest/node/lib/http.js 2013-08-22 13:55:28.000000000 +0200
+++ src/main/js/lib/http.js 2013-08-22 16:31:07.000000000 +0200
@@ -1009,12 +1009,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 @@
OutgoingMessage.prototype._finish = function() {
assert(this.connection);
if (this instanceof ServerResponse) {
@ -17,7 +17,7 @@
}
this.emit('finish');
};
@@ -1679,8 +1679,8 @@
@@ -1678,8 +1678,8 @@
}
@ -28,7 +28,7 @@
req.res = res;
res.req = req;
@@ -2023,8 +2023,8 @@
@@ -2055,8 +2055,8 @@
var res = new ServerResponse(req);
res.shouldKeepAlive = shouldKeepAlive;

View File

@ -1,5 +1,5 @@
--- /Users/jfdenise/workspaces/v10.latest/node/lib/tls.js 2013-08-22 13:55:28.000000000 +0200
+++ src/main/js/lib/tls.js 2013-08-26 17:58:15.000000000 +0200
--- ../node/lib/tls.js 2013-12-06 15:24:31.022049261 -0800
+++ src/main/js/lib/tls.js 2013-12-06 15:25:03.685750612 -0800
@@ -359,7 +359,10 @@
// Handle and report errors
@ -12,7 +12,7 @@
}
// Force SSL_read call to cycle some states/data inside OpenSSL
@@ -461,7 +464,16 @@
@@ -460,7 +463,16 @@
// Get NPN and Server name when ready
this.pair.maybeInitFinished();
@ -30,7 +30,7 @@
// `maybeInitFinished()` can emit the 'secure' event which
// in turn destroys the connection in case of authentication
// failure and sets `this.pair.ssl` to `null`.
@@ -1121,7 +1133,8 @@
@@ -1119,7 +1131,8 @@
passphrase: self.passphrase,
cert: self.cert,
ca: self.ca,
@ -40,7 +40,7 @@
secureProtocol: self.secureProtocol,
secureOptions: self.secureOptions,
crl: self.crl,
@@ -1136,6 +1149,12 @@
@@ -1134,6 +1147,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,
@@ -1331,6 +1350,10 @@
@@ -1330,6 +1349,10 @@
cleartext: options.cleartext,
encrypted: options.encrypted
});

View File

@ -1,6 +1,6 @@
--- ../node/test/simple/test-readline-interface.js 2013-05-03 13:58:42.000000000 +0200
+++ node/test/simple/test-readline-interface.js 2013-05-16 12:05:01.000000000 +0200
@@ -158,6 +158,7 @@
--- ../node/test/simple/test-readline-interface.js 2013-12-06 15:13:28.003097729 -0800
+++ test/simple/test-readline-interface.js 2013-12-06 15:25:17.018281776 -0800
@@ -170,6 +170,7 @@
// sending a multi-byte utf8 char over multiple writes
var buf = Buffer('☮', 'utf8');
@ -8,7 +8,7 @@
fi = new FakeInput();
rli = new readline.Interface({ input: fi, output: fi, terminal: terminal });
callCount = 0;
@@ -165,7 +166,7 @@
@@ -177,7 +178,7 @@
callCount++;
assert.equal(line, buf.toString('utf8'));
});

View File

@ -1,5 +1,5 @@
source.compatible.version = 0.10.18
libuv.compatible.version = 0.10.15
source.compatible.version = 0.10.21
libuv.compatible.version = 0.10.18
source.lib.modules = \
_linklist.js \