Julien Gilli
9660833586
Merge remote-tracking branch 'upstream/v0.12'
...
Conflicts:
src/node_version.h
2015-07-09 17:03:53 -07:00
Julien Gilli
9c5e9fc155
Merge remote-tracking branch 'upstream/v0.10' into v0.12
...
Conflicts:
AUTHORS
ChangeLog
deps/v8/src/log.cc
src/node_version.h
2015-07-09 15:30:29 -07:00
Shigeki Ohtsu
c5d7b31528
openssl: fix keypress requirement in apps on win32
...
reapply b910613792dac946b295855963869933a9089044
PR: #9451
PR-URL: https://github.com/joyent/node/pull/9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR: #25523
PR-URL: https://github.com/joyent/node/pull/25523
Reviewed-By: Julien Gilli <jgilli@fastmail.fm >
PR: #25654
PR-URL: https://github.com/joyent/node/pull/25654
Reviewed-By: Julien Gilli <jgilli@fastmail.fm >
2015-07-09 14:09:03 -07:00
Fedor Indutny
7ad593877e
deps: fix openssl assembly error on ia32 win32
...
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and
perhaps others) are requiring .686 .
PR: #9451
PR-URL: https://github.com/joyent/node/pull/9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR: #25523
PR-URL: https://github.com/joyent/node/pull/25523
Reviewed-By: Julien Gilli <jgilli@fastmail.fm >
PR: #25654
PR-URL: https://github.com/joyent/node/pull/25654
Reviewed-By: Julien Gilli <jgilli@fastmail.fm >
2015-07-09 14:09:03 -07:00
Shigeki Ohtsu
984e7f9e40
deps: separate sha256/sha512-x86_64.pl for openssl
...
sha256-x86_64.pl does not exist in the origin openssl distribution. It
was copied from sha512-x86_64.pl and both sha256/sha512 scripts were
modified so as to generates only one asm file specified as its key
hash length.
PR: #9451
PR-URL: https://github.com/joyent/node/pull/9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR: #25523
PR-URL: https://github.com/joyent/node/pull/25523
Reviewed-By: Julien Gilli <jgilli@fastmail.fm >
PR: #25654
PR-URL: https://github.com/joyent/node/pull/25654
Reviewed-By: Julien Gilli <jgilli@fastmail.fm >
2015-07-09 14:09:03 -07:00
Shigeki Ohtsu
8277822344
deps: copy all openssl header files to include dir
...
All symlink files in `deps/openssl/openssl/include/openssl/`
are removed and replaced with real header files to avoid
issues on Windows.
PR: #25654
PR-URL: https://github.com/joyent/node/pull/25654
Reviewed-By: Julien Gilli <jgilli@fastmail.fm >
2015-07-09 14:09:03 -07:00
Shigeki Ohtsu
0cf9f27703
deps: upgrade openssl sources to 1.0.1p
...
This just replaces all sources of openssl-1.0.1p.tar.gz
into deps/openssl/openssl.
PR: #25654
PR-URL: https://github.com/joyent/node/pull/25654
Reviewed-By: Julien Gilli <jgilli@fastmail.fm >
2015-07-09 14:09:03 -07:00
Julien Gilli
6aea173e93
Merge remote-tracking branch 'upstream/v0.12'
...
Conflicts:
src/node_version.h
2015-07-04 11:23:10 -07:00
Julien Gilli
9d3288c843
Merge branch 'v0.12.6-release' into v0.12
2015-07-03 19:34:23 -07:00
Fedor Indutny
78b0e30954
deps: fix out-of-band write in utf8 decoder
...
Originally reported by: Kris Reeves <kris.re@bbhmedia.com >
Reviewed-By: Trevor Norris <trev.norris@gmail.com >
2015-07-03 17:32:01 -07:00
yangguo@chromium.org
13ea50e927
V8: remove V8_HOST_CAN_READ_UNALIGNED and its uses
...
Fixes segfault in 32bit SmartOS when built with GCC 4.9.
This is the second of two backports from upstream v8:
1. 90dc5c9e66
2. 7cb82a76b4
Original commit message:
Reland "Remove V8_HOST_CAN_READ_UNALIGNED and its uses."
BUG=chromium:412967
LOG=N
R=jkummerow@chromium.org
Review URL: https://codereview.chromium.org/571903002
git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23938 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
V8 issue: https://code.google.com/p/chromium/issues/detail?id=412967
Fixes #25281
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR-URL: https://github.com/joyent/node/pull/25556
2015-07-01 08:37:03 -07:00
yangguo@chromium.org
48b0ca2616
V8: do not use wide reads in CopyCharsUnsigned
...
Fixes segfault in 32bit SmartOS when built with GCC 4.9.
This is the first of two backports from upstream v8:
1. 90dc5c9e66
2. 7cb82a76b4
Original commit message:
Do not use wide reads in CopyCharsUnsigned.
R=jkummerow@chromium.org
BUG=chromium:412967
LOG=Y
Review URL: https://codereview.chromium.org/566583002
git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23876 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
V8 issue: https://code.google.com/p/chromium/issues/detail?id=412967
Fixes #25281
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR-URL: https://github.com/joyent/node/pull/25556
2015-07-01 08:37:03 -07:00
Ben Noordhuis
88a27a9621
v8: cherry-pick JitCodeEvent patch from upstream
...
Original commit log follows:
Meaningful name for builtins in JitCodeEvent API.
Report builtins by name (e.g. "Builtin:ArgumentsAdaptorTrampoline")
instead of labeling everything "Builtin:A builtin from the snapshot"
Review URL: https://codereview.chromium.org/1216833002
Reviewed-By: Colin Ihrig <cjihrig@gmail.com >
PR-URL: https://github.com/joyent/node/pull/25589
2015-06-29 13:48:15 -07:00
Ben Noordhuis
5a60e0d904
v8: back-port JitCodeEvent patch from upstream
...
Original commit log follows:
Meaningful name for builtins in JitCodeEvent API.
Report builtins by name (e.g. "Builtin:ArgumentsAdaptorTrampoline")
instead of labeling everything "Builtin:A builtin from the snapshot"
Review URL: https://codereview.chromium.org/1216833002
Reviewed-By: Colin Ihrig <cjihrig@gmail.com >
PR-URL: https://github.com/joyent/node/pull/25588
2015-06-29 13:35:22 -07:00
Forrest L Norvell
8917e430b8
deps: upgrade to npm 2.11.3
...
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR-URL: https://github.com/joyent/node/pull/25545
2015-06-26 12:52:29 -07:00
Julien Gilli
c146855f06
Merge remote-tracking branch 'upstream/v0.12'
...
Conflicts:
src/node_version.h
2015-06-22 14:00:36 -07:00
Julien Gilli
f50c37d993
Merge remote-tracking branch 'upstream/v0.10' into v0.12
...
Conflicts:
AUTHORS
ChangeLog
lib/timers.js
src/node_version.h
test/common.js
2015-06-22 11:11:51 -07:00
Rebecca Turner
20d8db1a42
deps: upgrade to npm 2.11.2
...
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR-URL: https://github.com/joyent/node/pull/25517
2015-06-18 16:29:39 -07:00
Shigeki Ohtsu
9463cfae33
openssl: fix keypress requirement in apps on win32
...
reapply b910613792dac946b295855963869933a9089044
PR: #9451
PR-URL: https://github.com/joyent/node/pull/9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR: #25523
PR-URL: https://github.com/joyent/node/pull/25523
Reviewed-By: Julien Gilli <jgilli@fastmail.fm >
2015-06-17 12:55:20 -07:00
Fedor Indutny
81e30a11ba
deps: fix openssl assembly error on ia32 win32
...
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and
perhaps others) are requiring .686 .
PR: #9451
PR-URL: https://github.com/joyent/node/pull/9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR: #25523
PR-URL: https://github.com/joyent/node/pull/25523
Reviewed-By: Julien Gilli <jgilli@fastmail.fm >
2015-06-17 12:55:20 -07:00
Shigeki Ohtsu
3937563d9a
deps: separate sha256/sha512-x86_64.pl for openssl
...
sha256-x86_64.pl does not exist in the origin openssl distribution. It
was copied from sha512-x86_64.pl and both sha256/sha512 scripts were
modified so as to generates only one asm file specified as its key
hash length.
PR: #9451
PR-URL: https://github.com/joyent/node/pull/9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR: #25523
PR-URL: https://github.com/joyent/node/pull/25523
Reviewed-By: Julien Gilli <jgilli@fastmail.fm >
2015-06-17 12:55:20 -07:00
Shigeki Ohtsu
ee9545469d
deps: replace all headers in openssl
...
Change all openssl/include/openssl/*.h to include resolved symbolic
links and openssl/crypto/opensslconf.h to refer config/opensslconf.h.
PR: #25523
PR-URL: https://github.com/joyent/node/pull/25523
Reviewed-By: Julien Gilli <jgilli@fastmail.fm >
2015-06-17 12:55:19 -07:00
Shigeki Ohtsu
456c22f63f
deps: upgrade to openssl-1.0.1o
...
This just replaces all sources of openssl-1.0.1o.tar.gz into
deps/openssl/openssl.
PR: #25523
PR-URL: https://github.com/joyent/node/pull/25523
Reviewed-By: Julien Gilli <jgilli@fastmail.fm >
2015-06-17 12:55:19 -07:00
Trevor Norris
097607c782
build: fix use of strict aliasing
...
The -fno-strict-aliasing flag was added to fix compilation warnings when
building Node.js with GCC <= 4.4
PR: #25141
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR-URL: https://github.com/joyent/node/pull/25475
2015-06-16 15:50:24 -07:00
Saúl Ibarra Corretgé
50f961596d
deps: update libuv to version 1.6.1
...
Fixes: https://github.com/joyent/node/issues/9310
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR-URL: https://github.com/joyent/node/pull/25475
2015-06-16 15:50:23 -07:00
Kat Marchán
69967c67ab
deps: upgrade to npm 2.11.1
...
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR-URL: https://github.com/joyent/node/pull/25482
2015-06-11 12:43:32 -07:00
Dmitri Melikyan
b81a643f9a
V8: avoid deadlock when profiling is active
...
A deadlock happens when sampler initiated by SIGPROF tries to lock
the thread and the thread is already locked by the same thread. As
a result, other thread involved in sampling process hangs. The
patch adds a check for thread lock before continuing sampler
operation.
The fix has been tested on a sample app under load with and without
profiling turned on.
Fixes issue #14576 and specifically the duplicate issue #25295
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR-URL: https://github.com/joyent/node/pull/25309
2015-06-10 10:32:03 -07:00
Julien Gilli
f9d783abb9
Merge remote-tracking branch 'upstream/v0.12'
...
Conflicts:
doc/api/tls.markdown
src/node_version.h
2015-06-04 16:13:13 -07:00
Shigeki Ohtsu
fa4aa347eb
deps: add -no_rand_screen to openssl s_client
...
In openssl s_client on Windows, RAND_screen() is invoked to initialize
random state but it takes several seconds in each connection.
This added -no_rand_screen to openssl s_client on Windows to skip
RAND_screen() and gets a better performance in the unit test of
test-tls-server-verify.
Do not enable this except to use in the unit test.
(cherry picked from commit 9f0f7c38e6df975dd39735d0e9ef968076369c74)
Reviewed-By: James M Snell <jasnell@gmail.com >
PR-URL: https://github.com/joyent/node/pull/25368
2015-06-04 05:24:04 -07:00
Rebecca Turner
202c18bbc3
deps: upgrade to npm 2.10.1
...
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR-URL: https://github.com/joyent/node/pull/25364
2015-05-22 18:14:57 -07:00
cjihrig
6157697bd5
deps: revert v8 Array.prototype.values() removal
...
The Node 0.12 line was initially released with a version
of v8 that included Array.prototype.values(). In
https://github.com/joyent/node/pull/18206 , v8 was
updated to a version that dropped support for values().
https://codereview.chromium.org/647703003 removed this
method because it causes problems with some versions of
Outlook Web Access. This commit reverts the removal of
Array.prototype.values().
Original commit message:
Revert "Version 3.28.71.17 (merged r24706, r24708)"
This reverts commit 529541ecb58fd0d6df4dfbe41d01bff9ae21ff06.
Conflicts:
src/version.cc
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR-URL: https://github.com/joyent/node/pull/25328
2015-05-22 11:52:06 -07:00
Julien Gilli
0df5e1c049
Merge remote-tracking branch 'upstream/v0.12'
...
Conflicts:
src/node_version.h
2015-05-14 11:46:13 -07:00
Forrest L Norvell
03cfbd65fb
deps: upgrade npm to 2.9.1
...
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR-URL: https://github.com/joyent/node/pull/25289
2015-05-12 21:03:01 -07:00
Mike Tunnicliffe
80cdae855f
deps: don't busy loop in v8 cpu profiler thread
...
Backport 6964a9e0685fa186d9d9b7907be17505e839db1a from upstream v8.
Original commit message:
Make CPU profiler do not hog 100% of CPU.
Tick event processor should not stay in a tight loop
when there's nothing to do. It can go sleep until next sample event.
LOG=N
BUG=v8:3967
Committed: https://crrev.com/6964a9e0685fa186d9d9b7907be17505e839db1a
Cr-Commit-Position: refs/heads/master@{#28211}
Fixes #25137
Related: #9439 , #8789
PR: #25268
PR-URL: https://github.com/joyent/node/pull/25268
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com >
Reviewed-By: Julien Gilli <jgilli@fastmail.fm >
2015-05-11 18:14:55 -07:00
Trevor Norris
e1cc263ce8
build: fix use of strict aliasing
...
The -fno-strict-aliasing flag was added to fix compilation warnings when
building Node.js with GCC <= 4.4
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR-URL: https://github.com/joyent/node/pull/9179
PR: #25141
PR-URL: https://github.com/joyent/node/pull/25141
Reviewed-By: Trevor Norris <trev.norris@gmail.com >
Reviewed-By: Julien Gilli <jgilli@fastmail.fm >
2015-05-11 18:04:05 -07:00
Saúl Ibarra Corretgé
84f1ab6114
deps: update libuv to 1.5.0
...
PR: #25141
PR-URL: https://github.com/joyent/node/pull/25141
Reviewed-By: Trevor Norris <trev.norris@gmail.com >
Reviewed-By: Julien Gilli <jgilli@fastmail.fm >
2015-05-11 18:03:51 -07:00
Forrest L Norvell
8fc40af034
deps: upgrade npm to 2.8.4
...
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR-URL: https://github.com/joyent/node/pull/20311
2015-04-30 17:21:18 -07:00
adamk
2a5f4bd7ce
v8: fix issue with let bindings in for loops
...
Backport b17eaaa5755e625493c5fe537f42b58838923c52 from upstream v8.
Original commit message:
Fix desugaring of let bindings in for loops to handle continue properly
This requires putting the original loop's body inside an inner for loop (with
the same labels as the original loop) and re-binding the temp variables in its
"next" expression. A second flag is added to the desugared code to ensure the
loop body executes at most once per loop.
BUG=v8:3683
LOG=y
Review URL: https://codereview.chromium.org/720863002
Cr-Commit-Position: refs/heads/master@{#25363}
Fixes #9113 and #14411 .
Reviewed-By: Colin Ihrig <cjihrig@gmail.com >
PR-URL: https://github.com/joyent/node/pull/23948
2015-04-29 17:06:52 -07:00
Julien Gilli
712cb4340b
build: fix build for SmartOS
...
This change in V8: https://code.google.com/p/v8/source/detail?r=22210
has introduced a method named OS::GetCurrentThreadId which fails to
compile on OSes where a "gettid" syscall does not exist.
This build issue has been fixed upstream by several changes:
- https://code.google.com/p/v8/source/detail?r=23459 .
- https://codereview.chromium.org/649553002
- https://codereview.chromium.org/642223003
Another minor fix to the upstream changes was also necessary.
See https://code.google.com/p/v8/issues/detail?id=3620 for
more information.
The other build issue was due to the fact that alloca.h is not included
by other system includes on SmartOS, which is assumed by V8.
Built and tested on Linux, MacOS X, Windows and SmartOS.
Reviewed-By: Trevor Norris <trev.norris@gmail.com >
PR-URL: https://github.com/joyent/node/pull/18206
2015-04-29 14:25:50 -07:00
Yury Semikhatsky
5b2bf92211
deps: backport use strict fix for V8 debugger
...
Backport 2ad2237507c5b5f9047b8d94d2f4997327eae852 from V8.
Original commit message:
Fix Unhandled ReferenceError in debug-debugger.js
This fixes following exception in Sky on attempt to set a breakpoint
"Unhandled: Uncaught ReferenceError: break_point is not defined"
I think this happens in Sky but not in Chrome because Sky scripts are executed in strict mode.
BUG=None
LOG=N
R=yangguo@chromium.org
Review URL: https://codereview.chromium.org/741683002
Cr-Commit-Position: refs/heads/master@{#25415}
Reviewed-By: Trevor Norris <trev.norris@gmail.com >
PR-URL: https://github.com/joyent/node/pull/18206
2015-04-29 14:25:49 -07:00
Dave Pacheco
9a960c270c
mdb_v8: fix dictionary properties access
...
Reviewed-By: Trevor Norris <trev.norris@gmail.com >
PR-URL: https://github.com/joyent/node/pull/18206
2015-04-29 14:25:49 -07:00
Refael Ackermann
ace398ed42
deps: fix postmortem-metadata generator in v8
...
Reviewed-By: Trevor Norris <trev.norris@gmail.com >
PR-URL: https://github.com/joyent/node/pull/18206
2015-04-29 14:25:49 -07:00
Trevor Norris
beff91c44e
deps: apply floating irhydra patch to v8
...
Reviewed-By: Trevor Norris <trev.norris@gmail.com >
PR-URL: https://github.com/joyent/node/pull/18206
2015-04-29 14:25:48 -07:00
Trevor Norris
32166a90cf
deps: update V8 to 3.28.71.19
...
The 3.28.73 update was technically unstable code. This reverts the code
to the latest 3.28 stable release.
Reviewed-By: Trevor Norris <trev.norris@gmail.com >
PR-URL: https://github.com/joyent/node/pull/18206
2015-04-29 14:25:48 -07:00
Julien Gilli
94beb2985b
Merge remote-tracking branch 'upstream/v0.12'
...
Conflicts:
src/node_version.h
2015-04-01 12:01:22 -07:00
Forrest L Norvell
2704c62933
deps: upgrade npm to 2.7.4
...
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
PR-URL: https://github.com/joyent/node/pull/14180
2015-03-27 16:43:35 -07:00
Julien Gilli
9010dd2652
Merge remote-tracking branch 'upstream/v0.12'
...
Conflicts:
src/node_version.h
2015-03-23 21:43:00 -07:00
Julien Gilli
59d3f6864b
Merge branch 'v0.12.1-release' into v0.12
...
Conflicts:
ChangeLog
2015-03-23 19:47:20 -07:00
Shigeki Ohtsu
a43219bcd1
openssl: fix keypress requirement in apps on win32
...
reapply b910613792dac946b295855963869933a9089044
PR: #9451
PR-URL: https://github.com/joyent/node/pull/9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
2015-03-23 17:48:13 -07:00
Shigeki Ohtsu
b5a37e5603
deps: remove unused backup file in openssl asm
...
deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm.orig was accidentally
committed before.
PR: #9451
PR-URL: https://github.com/joyent/node/pull/9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com >
2015-03-23 17:48:13 -07:00