Skip to content

Commit 247d880

Browse files
ryry
committed
Merge branch 'v0.4'
Conflicts: src/node_version.h
2 parents 2c185a9 + 55048cd commit 247d880

File tree

540 files changed

+18388
-3225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

540 files changed

+18388
-3225
lines changed

‎ChangeLog

+43-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,46 @@
1-
2011.02.19, Version 0.4.1 (stable)
1+
2011.03.02, Version 0.4.2 (stable)
2+
3+
* Improve docs.
4+
5+
* Fix process.on edge case with signal event (Alexis Sellier)
6+
7+
* Pragma HTTP header comma separation
8+
9+
* In addition to 'aborted' emit 'close' from incoming requests
10+
(Felix Geisendörfer)
11+
12+
* Fix memleak in vm.runInNewContext
13+
14+
* Do not cache modules that throw exceptions (Felix Geisendörfer)
15+
16+
* Build system changes for libnode (Aria Stewart)
17+
18+
* Read up the prototype of the 'env' object. (Nathan Rajlich)
19+
20+
* Add 'close' and 'aborted' events to Agent responses
21+
22+
* http: fix missing 'drain' events (Russell Haering)
23+
24+
* Fix process.stdout.end() throws ENOTSOCK error. (Koichi Kobayashi)
25+
26+
* REPL bug fixes (isaacs)
27+
28+
* node_modules folders should be highest priority (isaacs)
29+
30+
* URL parse more safely (isaacs)
31+
32+
* Expose errno with a string for dns/cares (Felix Geisendörfer)
33+
34+
* Fix tty.setWindowSize
35+
36+
* spawn: setuid after chdir (isaacs)
37+
38+
* SIGUSR1 should break the VM without delay
39+
40+
* Upgrade V8 to 3.1.8.
41+
42+
43+
2011.02.19, Version 0.4.1 (stable), e8aef84191bc2c1ba2bcaa54f30aabde7f03769b
244

345
* Fixed field merging with progressive fields on writeHead()
446
(TJ Holowaychuk)

‎LICENSE

+50-45
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,8 @@
1-
This license applies to all parts of Node that are not externally
2-
maintained libraries. The externally maintained libraries used by Node
3-
are:
4-
5-
- v8, located under deps/v8, which is copyrighted by the Google, Inc.
6-
v8 has a BSD license.
7-
8-
- libev, located under deps/libev, and libeio, located at deps/libeio.
9-
This code is copyrighted by Marc Alexander Lehmann. Both are dually
10-
licensed under MIT and GPL2.
11-
12-
- WAF build system, located at tools/waf. Copyrighted Thomas Nagy.
13-
Released under an MIT license.
14-
15-
- The SCONS build system, located at tools/scons. Copyrighted by the SCONS
16-
Foundation. Released under an MIT license.
17-
18-
- C-Ares, an asynchronous DNS client, located at deps/c-ares. Copyright by
19-
the Massachusetts Institute of Technology; authored by Greg Hudson,
20-
Daniel Stenberg and others. Released under an MIT license.
21-
22-
- Node, optionally, dynmaically links to OpenSSL, cryptographic software
23-
written by Eric Young ([email protected]) to provide SSL/TLS encryption.
24-
OpenSSL is copyrighted by The OpenSSL Project. OpenSSL has a simple
25-
Apache-style license. OpenSSL is not included in the Node distribution.
26-
See http://openssl.org/ for more information.
27-
28-
- tools/doctool/markdown.js is Released under MIT license and
29-
Copyright 2009-2010 Dominic Baggott and Ash Berli
30-
31-
- HTTP Parser, located at deps/http_parser, is a small C library
32-
copyrighted by Ryan Lienhart Dahl and has a MIT license.
33-
34-
- src/platform_darwin_proctitle.cc, has code taken from the Chromium
35-
project copyright Google Inc. and released with the BSD license.
36-
37-
- tools/closure_linter is copyrighted by The Closure Linter Authors and
38-
Google Inc and is released under the Apache license.
39-
40-
- tools/cpplint.py is copyrighted by Google Inc and is released under the
41-
BSD license.
42-
43-
441
Node's license follows:
452

46-
Copyright 2009, 2010 Ryan Lienhart Dahl. All rights reserved.
3+
====
4+
5+
Copyright Joyent, Inc. and other Node contributors. All rights reserved.
476
Permission is hereby granted, free of charge, to any person obtaining a copy
487
of this software and associated documentation files (the "Software"), to
498
deal in the Software without restriction, including without limitation the
@@ -60,4 +19,50 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
6019
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
6120
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
6221
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
63-
IN THE SOFTWARE.
22+
IN THE SOFTWARE.
23+
24+
====
25+
26+
This license applies to all parts of Node that are not externally
27+
maintained libraries.
28+
29+
The externally maintained libraries used by Node are:
30+
31+
- v8, located at deps/v8. v8 is copyright Google, Inc, and released
32+
under a BSD license.
33+
34+
- libev, located at deps/libev, and libeio, located at deps/libeio. libev
35+
and libeio are copyright Marc Alexander Lehmann, and dual-licensed
36+
under the MIT license and GPL2.
37+
38+
- WAF build system, located at tools/waf. WAF is copyright Thomas Nagy,
39+
and released under the MIT license.
40+
41+
- The SCONS build system, located at tools/scons. SCONS is copyright
42+
the SCONS Foundation and released under the MIT license.
43+
44+
- C-Ares, an asynchronous DNS client, located at deps/c-ares. C-Ares is
45+
copyright the Massachusetts Institute of Technology, authored by
46+
Greg Hudson, Daniel Stenberg and others, and released under the MIT
47+
license.
48+
49+
- Node, optionally, dynamically links to OpenSSL, cryptographic software
50+
written by Eric Young ([email protected]) to provide SSL/TLS encryption.
51+
OpenSSL is copyright The OpenSSL Project and released under the OpenSSL
52+
license. OpenSSL is not included in the Node distribution.
53+
See http://openssl.org/ for more information.
54+
55+
- tools/doctool/markdown.js is copyright 2009-2010 Dominic Baggott and Ash
56+
Berli and released under the MIT license.
57+
58+
- HTTP Parser, located at deps/http_parser, is a small C library
59+
copyright Ryan Lienhart Dahl and released under the MIT license.
60+
61+
- src/platform_darwin_proctitle.cc, has code taken from the Chromium
62+
project copyright Google Inc. and released under a BSD license.
63+
64+
- tools/closure_linter is copyright The Closure Linter Authors and
65+
Google Inc. and released under the Apache License, version 2.0.
66+
67+
- tools/cpplint.py is copyright Google Inc. and released under a
68+
BSD license.

‎cmake/configure.cmake

+2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ endif()
6262

6363
if(${node_platform} MATCHES darwin)
6464
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Carbon")
65+
# explicitly set this so that we don't check again when building libeio
66+
set(HAVE_FDATASYNC 0)
6567
else()
6668
# OSX fdatasync() check wrong: http://public.kitware.com/Bug/view.php?id=10044
6769
check_function_exists(fdatasync HAVE_FDATASYNC)

‎cmake/node_build.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ set(node_sources
6262
src/node_script.cc
6363
src/node_os.cc
6464
src/node_dtrace.cc
65+
src/node_string.cc
6566
src/node_natives.h
6667
${node_extra_src})
6768

‎deps/v8/ChangeLog

+27
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
2011-03-02: Version 3.1.8
2+
3+
Fixed a number of crash bugs.
4+
5+
Improved Crankshaft for x64 and ARM.
6+
7+
Implemented more of EcmaScript 5 strict mode.
8+
9+
Fixed issue with unaligned reads and writes on ARM.
10+
11+
Improved heap profiler support.
12+
13+
14+
2011-02-28: Version 3.1.7
15+
16+
Fixed a number of crash bugs.
17+
18+
Improved Crankshaft for x64 and ARM.
19+
20+
Fixed implementation of indexOf/lastIndexOf for sparse
21+
arrays (http://crbug.com/73940).
22+
23+
Fixed bug in map space compaction (http://crbug.com/59688).
24+
25+
Added support for direct getter accessors calls on ARM.
26+
27+
128
2011-02-24: Version 3.1.6
229

330
Fixed a number of crash bugs.

‎deps/v8/SConstruct

-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@ V8_EXTRA_FLAGS = {
306306
'gcc': {
307307
'all': {
308308
'WARNINGFLAGS': ['-Wall',
309-
'-Werror',
310309
'-W',
311310
'-Wno-unused-parameter',
312311
'-Wnon-virtual-dtor']

‎deps/v8/src/api.cc

+4-2
Original file line numberDiff line numberDiff line change
@@ -2286,7 +2286,8 @@ bool v8::Object::Set(v8::Handle<Value> key, v8::Handle<Value> value,
22862286
self,
22872287
key_obj,
22882288
value_obj,
2289-
static_cast<PropertyAttributes>(attribs));
2289+
static_cast<PropertyAttributes>(attribs),
2290+
i::kNonStrictMode);
22902291
has_pending_exception = obj.is_null();
22912292
EXCEPTION_BAILOUT_CHECK(false);
22922293
return true;
@@ -2711,7 +2712,8 @@ bool v8::Object::SetHiddenValue(v8::Handle<v8::String> key,
27112712
hidden_props,
27122713
key_obj,
27132714
value_obj,
2714-
static_cast<PropertyAttributes>(None));
2715+
static_cast<PropertyAttributes>(None),
2716+
i::kNonStrictMode);
27152717
has_pending_exception = obj.is_null();
27162718
EXCEPTION_BAILOUT_CHECK(false);
27172719
return true;

‎deps/v8/src/arm/assembler-arm.h

+1
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ const SwVfpRegister s29 = { 29 };
284284
const SwVfpRegister s30 = { 30 };
285285
const SwVfpRegister s31 = { 31 };
286286

287+
const DwVfpRegister no_dreg = { -1 };
287288
const DwVfpRegister d0 = { 0 };
288289
const DwVfpRegister d1 = { 1 };
289290
const DwVfpRegister d2 = { 2 };

0 commit comments

Comments
 (0)