upgrade to v0.10.22 (latest stable)

Reviewed-by: kinsleyw
This commit is contained in:
akhil 2013-12-06 16:29:39 -08:00
parent 7e56c3f1b3
commit 52c9d72ef2
5 changed files with 12 additions and 12 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.21
c) git checkout v0.10.22
(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

@ -142,7 +142,7 @@
<target name="configure-unix" depends="config-gyp" if="isLinux">
<exec executable="python" dir="." failonerror="true">
<arg value="${source.home}/tools/gyp/gyp"/>
<arg value="${source.home}/tools/gyp/gyp_main.py"/>
<arg value="--depth=."/>
<arg value="--format=make"/>
<arg value="${product.name}.gyp"/>
@ -153,7 +153,7 @@
<target name="configure-mac" depends="config-gyp" if="isMacOSX">
<exec executable="python" dir="." failonerror="true">
<arg value="${source.home}/tools/gyp/gyp"/>
<arg value="${source.home}/tools/gyp/gyp_main.py"/>
<arg value="--depth=."/>
<arg value="--format=make"/>
<arg value="${product.name}.gyp"/>
@ -164,7 +164,7 @@
<target name="configure-windows" depends="config-gyp" if="isWindows">
<exec executable="python" dir="." failonerror="true">
<arg value="${source.home}/tools/gyp/gyp"/>
<arg value="${source.home}/tools/gyp/gyp_main.py"/>
<arg value="--depth=."/>
<arg value="${product.name}.gyp"/>
<arg value="-Dtarget=${build.type}"/>

View File

@ -104,7 +104,7 @@
<attribute name="target"/>
<sequential>
<exec executable="python" dir="." failonerror="true">
<arg value="${source.home}/tools/gyp/gyp"/>
<arg value="${source.home}/tools/gyp/gyp_main.py"/>
<arg value="--depth=."/>
<arg value="--format=@{format}"/>
<arg value="-Dtarget_arch=x64"/>

View File

@ -1,5 +1,5 @@
--- ../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
--- ../node/lib/tls.js 2013-12-06 16:10:13.427409262 -0800
+++ src/main/js/lib/tls.js 2013-12-06 16:10:41.639204375 -0800
@@ -359,7 +359,10 @@
// Handle and report errors
@ -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`.
@@ -1119,7 +1131,8 @@
@@ -1125,7 +1137,8 @@
passphrase: self.passphrase,
cert: self.cert,
ca: self.ca,
@ -40,7 +40,7 @@
secureProtocol: self.secureProtocol,
secureOptions: self.secureOptions,
crl: self.crl,
@@ -1134,6 +1147,12 @@
@@ -1140,6 +1153,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,
@@ -1330,6 +1349,10 @@
@@ -1336,6 +1355,10 @@
cleartext: options.cleartext,
encrypted: options.encrypted
});

View File

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