Ben Noordhuis
c80bde1781
v8: work around String::WriteAscii segfault
...
See http://code.google.com/p/v8/issues/detail?id=2493 for details.
This commit reapplies 9668df8
. The issue has been fixed upstream but
reappeared after last night's downgrade to V8 3.14.5 in commit b15a10e
.
Conflicts:
test/simple/test-buffer.js
2013-02-26 18:27:30 +01:00
Andrei Sedoi
17c6fe2e22
mips: fix openssl build
2013-02-26 17:03:07 +01:00
Fedor Indutny
aa98539277
v8: fix postmortem and dtrace helper build
...
Regardless of previous @bnoordhuis' changes
2013-02-26 08:17:21 +00:00
Ben Noordhuis
03fe7fb55c
v8: reapply floating patches
...
Reapply floating patches. Special mention: also reapplies 017009f
but
with the extra change of removing DescriptorArray::kTransitionsIndex
from the postmortem metadata generator because said field no longer
exists in V8 3.14.
2013-02-25 23:45:02 +01:00
Ben Noordhuis
b15a10e7a0
deps: downgrade v8 to 3.14.5
...
V8 3.15 and newer have stability and performance issues. Roll back to
a known-good version.
2013-02-25 23:45:02 +01:00
isaacs
ff540e19a4
uv: Upgrade to 86ae8b3c
2013-02-25 13:07:25 -08:00
Ben Noordhuis
de9ee2a483
deps: upgrade libuv to e89aced
2013-02-24 04:03:49 +01:00
Ben Noordhuis
6ad792610b
deps: upgrade libuv to 26fa6f8
2013-02-20 21:29:52 +01:00
Ben Noordhuis
0dcbecd32b
crypto: fix uninitialized memory access in openssl
...
ASN1_STRING_to_UTF8() passes an ASN1_STRING to ASN1_STRING_set() but forgot to
initialize the `length` field.
Fixes the following valgrind error:
$ valgrind -q --track-origins=yes --num-callers=19 \
out/Debug/node test/simple/test-tls-client-abort.js
==2690== Conditional jump or move depends on uninitialised value(s)
==2690== at 0x784B69: ASN1_STRING_set (asn1_lib.c:382)
==2690== by 0x809564: ASN1_mbstring_ncopy (a_mbstr.c:204)
==2690== by 0x8090F0: ASN1_mbstring_copy (a_mbstr.c:86)
==2690== by 0x782F1F: ASN1_STRING_to_UTF8 (a_strex.c:570)
==2690== by 0x78F090: asn1_string_canon (x_name.c:409)
==2690== by 0x78EF17: x509_name_canon (x_name.c:354)
==2690== by 0x78EA7D: x509_name_ex_d2i (x_name.c:210)
==2690== by 0x788058: ASN1_item_ex_d2i (tasn_dec.c:239)
==2690== by 0x7890D4: asn1_template_noexp_d2i (tasn_dec.c:746)
==2690== by 0x788CB6: asn1_template_ex_d2i (tasn_dec.c:607)
==2690== by 0x78877A: ASN1_item_ex_d2i (tasn_dec.c:448)
==2690== by 0x7890D4: asn1_template_noexp_d2i (tasn_dec.c:746)
==2690== by 0x788CB6: asn1_template_ex_d2i (tasn_dec.c:607)
==2690== by 0x78877A: ASN1_item_ex_d2i (tasn_dec.c:448)
==2690== by 0x787C93: ASN1_item_d2i (tasn_dec.c:136)
==2690== by 0x78F5E4: d2i_X509 (x_x509.c:141)
==2690== by 0x7C9B91: PEM_ASN1_read_bio (pem_oth.c:81)
==2690== by 0x7CA506: PEM_read_bio_X509 (pem_x509.c:67)
==2690== by 0x703C9A: node::crypto::SecureContext::AddRootCerts(v8::Arguments const&) (node_crypto.cc:497)
==2690== Uninitialised value was created by a stack allocation
==2690== at 0x782E89: ASN1_STRING_to_UTF8 (a_strex.c:560)
2013-02-20 17:01:47 +04:00
Bert Belder
da945a7376
openssl: make perlasm target pentium or newer for masm outputs
...
When perlasm generates MASM code it sets the assembler target to 468.
In this mode MASM refuses to assemble a couple of instructions. Bumping
the target to 686 solves this problem.
2013-02-20 17:00:29 +04:00
Bert Belder
eb29c4b2e6
openssl: disable HT sidechannel attack mitigation
...
It used to be off before. It's extremely unlikely that such an attack
would be a viable attack against node. And it makes AES much slower.
2013-02-20 16:49:03 +04:00
Fedor Indutny
f317f5aee9
openssl: update to 1.0.1e
2013-02-20 16:48:20 +04:00
isaacs
4911a30803
npm: Upgrade to 1.2.12
2013-02-19 13:18:36 -08:00
isaacs
d75e39794b
Merge remote-tracking branch 'ry/v0.8' into master
...
Conflicts:
AUTHORS
ChangeLog
lib/http.js
src/node_version.h
test/simple/test-http-header-response-splitting.js
2013-02-18 10:21:08 -08:00
isaacs
73be4608d9
npm: Upgrade to v1.2.11
2013-02-15 10:49:30 -08:00
isaacs
e4a856e0ba
V8: Reapply floating patches
2013-02-08 17:18:41 -08:00
isaacs
0c2e5ec840
V8: Upgrade to 3.15.11.15
2013-02-08 17:17:45 -08:00
isaacs
5cc3569f6d
Merge remote-tracking branch 'ry/v0.8' into master
...
Conflicts:
AUTHORS
ChangeLog
deps/npm/html/api/bin.html
deps/npm/html/api/bugs.html
deps/npm/html/api/commands.html
deps/npm/html/api/config.html
deps/npm/html/api/deprecate.html
deps/npm/html/api/docs.html
deps/npm/html/api/edit.html
deps/npm/html/api/explore.html
deps/npm/html/api/help-search.html
deps/npm/html/api/init.html
deps/npm/html/api/install.html
deps/npm/html/api/link.html
deps/npm/html/api/load.html
deps/npm/html/api/ls.html
deps/npm/html/api/npm.html
deps/npm/html/api/outdated.html
deps/npm/html/api/owner.html
deps/npm/html/api/pack.html
deps/npm/html/api/prefix.html
deps/npm/html/api/prune.html
deps/npm/html/api/publish.html
deps/npm/html/api/rebuild.html
deps/npm/html/api/restart.html
deps/npm/html/api/root.html
deps/npm/html/api/run-script.html
deps/npm/html/api/search.html
deps/npm/html/api/shrinkwrap.html
deps/npm/html/api/start.html
deps/npm/html/api/stop.html
deps/npm/html/api/submodule.html
deps/npm/html/api/tag.html
deps/npm/html/api/test.html
deps/npm/html/api/uninstall.html
deps/npm/html/api/unpublish.html
deps/npm/html/api/update.html
deps/npm/html/api/version.html
deps/npm/html/api/view.html
deps/npm/html/api/whoami.html
deps/npm/html/doc/README.html
deps/npm/html/doc/adduser.html
deps/npm/html/doc/bin.html
deps/npm/html/doc/bugs.html
deps/npm/html/doc/build.html
deps/npm/html/doc/bundle.html
deps/npm/html/doc/cache.html
deps/npm/html/doc/changelog.html
deps/npm/html/doc/coding-style.html
deps/npm/html/doc/completion.html
deps/npm/html/doc/config.html
deps/npm/html/doc/dedupe.html
deps/npm/html/doc/deprecate.html
deps/npm/html/doc/developers.html
deps/npm/html/doc/disputes.html
deps/npm/html/doc/docs.html
deps/npm/html/doc/edit.html
deps/npm/html/doc/explore.html
deps/npm/html/doc/faq.html
deps/npm/html/doc/folders.html
deps/npm/html/doc/global.html
deps/npm/html/doc/help-search.html
deps/npm/html/doc/help.html
deps/npm/html/doc/index.html
deps/npm/html/doc/init.html
deps/npm/html/doc/install.html
deps/npm/html/doc/json.html
deps/npm/html/doc/link.html
deps/npm/html/doc/ls.html
deps/npm/html/doc/npm.html
deps/npm/html/doc/outdated.html
deps/npm/html/doc/owner.html
deps/npm/html/doc/pack.html
deps/npm/html/doc/prefix.html
deps/npm/html/doc/prune.html
deps/npm/html/doc/publish.html
deps/npm/html/doc/rebuild.html
deps/npm/html/doc/registry.html
deps/npm/html/doc/removing-npm.html
deps/npm/html/doc/restart.html
deps/npm/html/doc/rm.html
deps/npm/html/doc/root.html
deps/npm/html/doc/run-script.html
deps/npm/html/doc/scripts.html
deps/npm/html/doc/search.html
deps/npm/html/doc/semver.html
deps/npm/html/doc/shrinkwrap.html
deps/npm/html/doc/star.html
deps/npm/html/doc/start.html
deps/npm/html/doc/stop.html
deps/npm/html/doc/submodule.html
deps/npm/html/doc/tag.html
deps/npm/html/doc/test.html
deps/npm/html/doc/uninstall.html
deps/npm/html/doc/unpublish.html
deps/npm/html/doc/update.html
deps/npm/html/doc/version.html
deps/npm/html/doc/view.html
deps/npm/html/doc/whoami.html
deps/npm/man/man1/global.1
deps/npm/man/man1/ls.1
deps/npm/man/man1/npm.1
deps/npm/man/man1/rm.1
deps/npm/man/man3/npm.3
deps/npm/node_modules/glob/glob.js
deps/npm/node_modules/glob/package.json
deps/npm/node_modules/node-gyp/package.json
deps/npm/node_modules/npm-registry-client/package.json
deps/npm/node_modules/npmconf/package.json
deps/npm/node_modules/read-installed/package.json
deps/npm/node_modules/rimraf/package.json
deps/npm/node_modules/rimraf/rimraf.js
deps/npm/package.json
deps/uv/src/win/error.c
doc/api/crypto.markdown
lib/zlib.js
src/node_version.h
src/node_zlib.cc
test/simple/test-buffer.js
2013-02-06 16:29:30 -08:00
isaacs
5aef65a98a
npm: Upgrade to v1.2.10
2013-02-06 08:39:31 -08:00
Bryan Cantrill
202b5db4ef
v8: loosen artificial mmap constraint
...
Fixes #4010 .
2013-02-06 13:30:59 +04:00
Bert Belder
1a87776be9
deps: upgrade libuv to 034ea31
2013-01-30 20:30:10 +01:00
isaacs
e722ca32d9
npm: Upgrade to v1.2.3
2013-01-24 09:10:01 -08:00
isaacs
7a2ebce8d8
V8: Reapply floating patches
2013-01-24 09:10:01 -08:00
isaacs
8024252877
V8: Upgrade to 3.15.11.10
2013-01-24 09:10:01 -08:00
Bert Belder
e2acf26a91
deps: upgrade libuv to e4d8cba
2013-01-23 00:17:01 +01:00
Ben Noordhuis
814bdf0f51
deps: upgrade libuv to 7841f77
2013-01-22 16:21:25 +01:00
isaacs
4d32fc5964
npm: Upgrade to v1.2.2
2013-01-18 12:12:07 -08:00
isaacs
0459a60232
npm: Upgrade to 1.2.2
2013-01-18 08:37:32 -08:00
Ben Noordhuis
8b0f3ce397
v8: add %p option to --logfile, expands to pid
...
Useful when you are profiling multiple instances of V8 concurrently.
Submitted upstream: http://code.google.com/p/v8/issues/detail?id=2503
Refs #4617 .
2013-01-18 01:33:12 +01:00
Ben Noordhuis
952e42de72
deps: upgrade libuv to 4ba03dd
2013-01-16 23:38:02 +01:00
Ben Noordhuis
9668df8b39
v8: work around String::WriteAscii segfault
...
See http://code.google.com/p/v8/issues/detail?id=2493 for details.
Once the patch lands in upstream V8, this commit can be reverted.
2013-01-15 23:46:30 +01:00
yangguo@chromium.org
926c90bc64
v8: Hardfloat does not imply VFPv3, only VFPv2.
...
Raspberry Pi is an example.
BUG=v8:2393
Review URL: https://chromiumcodereview.appspot.com/11570061
Patch from Chi-Thanh Christopher Nguyen <nguyenchithanh@gmail.com>.
git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@13232 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This is a backport of v8/v8@44419ad089 .
2013-01-13 18:26:58 +01:00
Ben Noordhuis
e4f2a140d2
deps: upgrade libuv to 8e3e60f
2013-01-13 01:29:34 +01:00
Ben Noordhuis
8018113910
v8: remove optimization switches
...
Remove compiler switches from $(TOPLEVEL)/deps/v8/build/common.gypi,
we set them globally in $(TOPLEVEL)/common.gypi.
Commit 7b4d95a
introduced the switches again, resulting in V8 getting
built without any optimizations.
This commit is essentially a rehash of commit 4b8629d
.
2013-01-12 00:34:36 +04:00
Fedor Indutny
d22bd9e3c4
deps: update v8 to 3.15.11.7
2013-01-12 00:10:45 +04:00
isaacs
97db62b4d9
Merge remote-tracking branch 'ry/v0.8' into master
...
Conflicts:
AUTHORS
ChangeLog
Makefile
src/node_version.h
2013-01-11 10:18:07 -08:00
Ben Noordhuis
31fc52ab53
deps: upgrade libuv to 9aab5d4
2013-01-11 14:00:19 +01:00
yangguo@chromium.org
438e0c6d75
v8: Hardfloat does not imply VFPv3, only VFPv2.
...
Raspberry Pi is an example.
BUG=v8:2393
Review URL: https://chromiumcodereview.appspot.com/11570061
Patch from Chi-Thanh Christopher Nguyen <nguyenchithanh@gmail.com>.
git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@13232 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This is a backport of v8/v8@44419ad089 .
2013-01-10 17:02:59 -08:00
isaacs
aa742ddf80
npm: Upgrade to v1.2.0
2013-01-09 15:21:30 -08:00
Ben Noordhuis
93591a2a88
v8: remove optimization switches
...
Remove compiler switches from $(TOPLEVEL)/deps/v8/build/common.gypi,
we set them globally in $(TOPLEVEL)/common.gypi.
Commit 7b4d95a
introduced the switches again, resulting in V8 getting
built without any optimizations.
This commit is essentially a rehash of commit 4b8629d
.
2013-01-04 20:06:03 +04:00
Fedor Indutny
0054264d88
v8: update to 3.15.11.5
2013-01-04 15:44:47 +04:00
Ben Noordhuis
ce1b33a9dc
v8: remove optimization switches
...
Remove compiler switches from $(TOPLEVEL)/deps/v8/build/common.gypi,
we set them globally in $(TOPLEVEL)/common.gypi.
Commit 7b4d95a
introduced the switches again, resulting in V8 getting
built without any optimizations.
This commit is essentially a rehash of commit 4b8629d
.
2013-01-03 02:37:22 +01:00
Fedor Indutny
7b4d95a976
deps: update v8 to 3.15.11
2013-01-01 16:07:02 +04:00
Ben Noordhuis
a7cc53067d
deps: upgrade libuv to 4997738
2012-12-29 17:34:41 +01:00
Ben Noordhuis
6ecb0cd65d
openssl: clean up openssl.gyp
...
Remove obsolete build configuration that escaped the purge in 7eaea7f
.
2012-12-24 16:02:13 +01:00
isaacs
f119effc9f
Merge remote-tracking branch 'ry/v0.8'
2012-12-21 11:08:32 -08:00
isaacs
d30e76e0e8
npm: upgrade to 1.1.70
2012-12-21 16:42:29 +00:00
Bert Belder
7475982801
openssl: enable optimized asm code on x86 and x64
2012-12-20 15:02:59 +01:00
Bert Belder
5edbb53c45
openssl: regenerate asm files for openssl 1.0.1
2012-12-20 15:02:59 +01:00
Bert Belder
1b5c5b137d
openssl: update makefile for asm files to work with openssl 1.0.1
2012-12-20 15:02:58 +01:00
Bert Belder
1d97db5acf
openssl: disable HT sidechannel attack mitigation
...
It used to be off before. It's extremely unlikely that such an attack
would be a viable attack against node. And it makes AES much slower.
2012-12-20 15:02:57 +01:00
Bert Belder
aeae22cbb2
openssl: revert empty_OPENSSL_cpuid_setup.patch
2012-12-20 15:02:57 +01:00
Bert Belder
2e6180a62a
openssl: make perlasm target pentium or newer for masm outputs
...
When perlasm generates MASM code it sets the assembler target to 468.
In this mode MASM refuses to assemble a couple of instructions. Bumping
the target to 686 solves this problem.
2012-12-20 15:02:56 +01:00
Bert Belder
7eaea7f9e5
openssl: clean up and merge configuration files
...
This patch brings the openssl library that is built with gyp closer
to what the standard build system produces.
All opensslconf.h versions are now merged into a single file, which
makes it easier for compiled addons to locate this file.
2012-12-20 15:02:56 +01:00
Ben Noordhuis
7b2ef2de20
deps: upgrade libuv to dc559a5
2012-12-18 15:46:00 +01:00
Fedor Indutny
ba754524a9
deps: upgrade libuv to b86ed94
2012-12-18 14:15:02 +04:00
isaacs
77ed12fe7a
Merge remote-tracking branch 'ry/v0.8' into master
...
Conflicts:
AUTHORS
ChangeLog
deps/uv/test/test-spawn.c
deps/uv/uv.gyp
src/cares_wrap.cc
src/node.cc
src/node_version.h
test/simple/test-buffer.js
tools/gyp/pylib/gyp/common.py
tools/install.py
2012-12-13 16:57:58 -08:00
Ben Noordhuis
6cf68aead6
deps: upgrade libuv to e079a99
2012-12-13 20:23:01 +01:00
isaacs
b09f97068e
npm: Upgrade to v1.1.69
2012-12-12 14:41:28 -08:00
Ben Noordhuis
f8999da514
build: avoid -Wno-old-style-declaration with gcc 4.2
...
Fixes the build on FreeBSD <= 9 with the default compiler.
Fixes #4186 .
2012-12-03 02:21:32 +01:00
isaacs
db008f7cce
npm: Upgrade to 1.1.66
2012-11-23 12:51:23 -08:00
Ben Noordhuis
a25ebb1997
v8: fix dragonflybsd build
...
* fix gyp build
* don't require libexecinfo, it's not there
* libpthread doesn't implement sem_timedwait(), fall back to sem_wait()
Upstreamed in https://codereview.chromium.org/11421013/
2012-11-20 22:48:26 +01:00
Ben Noordhuis
1e738c5ef2
build: make python executable configurable
...
Upstreamed in https://codereview.chromium.org/11418101/
Fixes #4287 .
2012-11-20 22:47:45 +01:00
Ben Noordhuis
815a181d03
deps: upgrade cares to 213f2b7
2012-11-20 22:44:23 +01:00
Ben Noordhuis
8ba1bec47d
deps: upgrade libuv to fc5984f
2012-11-20 22:44:23 +01:00
Ben Noordhuis
7716828166
deps: upgrade libuv to 5639b2f
2012-11-20 19:21:48 +01:00
Ben Noordhuis
b6a3b0a629
deps: upgrade libuv to 665a316
2012-11-16 17:58:42 +01:00
Bert Belder
9b22944b68
windows: fix the x64 debug build
2012-11-08 23:54:53 +01:00
Timothy J Fontaine
d264b23077
build: add postmortem as a dependency if enabled
2012-11-06 00:18:36 +01:00
Ben Noordhuis
a7ac1a1d88
deps: upgrade libuv to 0ddf9d6
2012-11-04 01:25:06 +01:00
Ben Noordhuis
ab1e66d93f
deps: upgrade libuv to 97c527a
2012-11-01 01:22:16 +01:00
isaacs
e1bdde05c7
V8 build: 'echo -n' considered harmful
2012-10-25 11:46:13 -07:00
isaacs
822e13d375
npm: Upgrade to 1.1.65
2012-10-25 09:15:35 -07:00
Ben Noordhuis
9b61f570d8
Merge remote-tracking branch 'origin/v0.8'
...
Conflicts:
configure
deps/v8/build/common.gypi
2012-10-25 16:08:58 +02:00
Ben Noordhuis
4b8629db37
v8: remove optimization switches
...
Remove compiler switches from $(TOPLEVEL)/deps/v8/build/common.gypi, we set
them globally in $(TOPLEVEL)/common.gypi.
Commit 29d12c73
accidentally reintroduced the switches again. In particular,
the 'cflags!': ['-O2','-Os'] section forced building V8 without any
optimizations, resulting in a steep (~66%) performance drop on some benchmarks.
Fixes #4191 .
2012-10-25 01:06:00 +02:00
Bert Belder
fa94f0fe83
v8: don't show performance warnings when compiling with msvc
...
Patch sent upstream: http://codereview.chromium.org/10829109/
2012-10-24 21:29:46 +02:00
isaacs
abf37c1e66
V8 build: 'echo -n' considered harmful
2012-10-24 09:21:44 -07:00
isaacs
c3ca783525
Merge remote-tracking branch 'ry/v0.8'
...
Conflicts:
deps/v8/src/arm/code-stubs-arm.cc
deps/v8/src/version.cc
2012-10-23 11:59:19 -07:00
isaacs
a0ee291566
V8: Reapply patches
2012-10-23 11:50:46 -07:00
isaacs
95c9305874
V8: Upgrade to 3.13.7.4
2012-10-23 11:48:55 -07:00
isaacs
76a6c4bf2e
V8: Reapply patches
2012-10-23 11:38:09 -07:00
isaacs
29d12c7342
V8: Upgrade to 3.11.10.25
2012-10-23 11:35:27 -07:00
isaacs
7413df0c1f
npm: Upgrade to 1.1.64
2012-10-23 11:34:46 -07:00
mstarzinger@chromium.org
e8b0427be2
v8: make GDBJIT interface compile again
...
R=ulan@chromium.org
BUG=v8:1804
Review URL: https://codereview.chromium.org/11022007
This is a back-port of upstream commits 12679, 12686 and 12738.
2012-10-23 17:42:43 +02:00
isaacs
18beea4a3f
Merge remote-tracking branch 'ry/v0.8'
2012-10-23 08:22:47 -07:00
yangguo@chromium.org
9fa953d3e7
v8: use correct timezone information on Solaris
...
`timezone` variable contains the difference, in seconds, between UTC and
local standard time (see `man 3 localtime` on Solaris).
Call to `tzset` is required to apply contents of `TZ` variable to
`timezone` variable.
BUG=v8:2064
Review URL: https://chromiumcodereview.appspot.com/10967066
Patch from Maciej Małecki <me@mmalecki.com>.
This is a back-port of upstream commit r12802.
2012-10-23 16:43:38 +02:00
Ben Noordhuis
d0227b0308
Merge remote-tracking branch 'origin/v0.8'
...
Conflicts:
deps/openssl/openssl.gyp
2012-10-21 23:06:48 +02:00
Bert Belder
c11c19b92c
uv: upgrade to 1e32cb0
2012-10-17 18:33:45 +02:00
Ben Noordhuis
28b0cc08b8
Revert "Disable OpenSSL UI"
...
This reverts commit 1c88c3b3b5
.
It breaks the "read a password from stdin" functionality that OpenSSL provides.
Fixes #4059 , #4143 .
Conflicts:
deps/openssl/openssl.gyp
2012-10-15 23:40:15 +02:00
Nathan Rajlich
4b238b4c2a
Merge remote-tracking branch 'origin/v0.8'
...
Conflicts:
AUTHORS
ChangeLog
deps/uv/test/runner-win.c
doc/api/process.markdown
lib/repl.js
src/node_crypto.cc
src/node_version.h
2012-10-13 16:16:56 -07:00
isaacs
218f08dbde
npm: Upgrade to 1.1.63
2012-10-11 14:11:38 -07:00
Ben Noordhuis
d7c45ea7d0
deps: upgrade libuv to 47b2cd3
2012-10-11 14:36:23 +02:00
Bert Belder
87518f1e3c
uv: upgrade to b0c1a38
2012-10-10 17:18:48 +02:00
Ben Noordhuis
5823290390
deps: upgrade libuv to cb03e3b
2012-10-10 02:17:32 +02:00
Ben Noordhuis
16a9dac8ea
deps: upgrade libuv to 40134c3
2012-10-08 00:44:47 +02:00
Ben Noordhuis
ee77a6a953
deps: upgrade libuv to b9ed1a6
2012-10-07 00:44:38 +02:00
isaacs
ae40f1c438
Merge remote-tracking branch 'ry/v0.8' into v0.8-merge
...
Conflicts:
AUTHORS
ChangeLog
deps/openssl/openssl.gyp
deps/uv/src/unix/linux/linux-core.c
deps/uv/src/unix/process.c
deps/uv/src/unix/stream.c
deps/v8/src/arm/builtins-arm.cc
deps/v8/src/arm/code-stubs-arm.cc
deps/v8/src/arm/full-codegen-arm.cc
lib/tls.js
src/node_version.h
test/simple/test-http-client-timeout-agent.js
2012-09-28 09:47:48 -07:00
Bert Belder
d05d6a35b6
openssl: fix compilation issues on SmartOS x64
...
the SunOS linker is more strict than usual, so we have to be more
correct.
2012-09-25 13:48:14 -07:00
Bert Belder
e0e9f0c15a
openssl: use optimized asm code on x86 and x64
2012-09-25 08:51:05 -07:00
Bert Belder
823e807b5b
openssl: add generated asm code
2012-09-25 08:51:04 -07:00