Skip to content

Commit af1ed99

Browse files
bnoordhuisbnoordhuis
committed
Merge remote-tracking branch 'origin/v0.10'
Conflicts: AUTHORS ChangeLog deps/uv/ChangeLog deps/uv/src/version.c lib/http.js src/node_crypto.cc src/node_os.cc src/node_version.h test/simple/helper-debugger-repl.js
2 parents 9cfc929 + 4fdb8ac commit af1ed99

File tree

525 files changed

+21645
-42095
lines changed

Some content is hidden

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

525 files changed

+21645
-42095
lines changed

‎AUTHORS‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,13 +434,16 @@ Benjamin Ruston <benjy.ruston@gmail.com>
434434
Manav Rathi <manav.r@directi.com>
435435
Marcin Kostrzewa <marcinkostrzewa@yahoo.com>
436436
Suwon Chae <doortts@gmail.com>
437+
David Braun <NodeJS-box@snkmail.com>
437438
Mitar Milutinovic <mitar.git@tnode.com>
438439
Michael Hart <michael.hart.au@gmail.com>
439440
Andrew Hart <hartandrewr@gmail.com>
440441
Rafael Garcia <rgarcia2009@gmail.com>
441442
Tobias Müllerleile <tobias@muellerleile.net>
442-
David Braun <NodeJS-box@snkmail.com>
443443
Stanislav Ochotnicky <sochotnicky@redhat.com>
444444
Ryan Graham <r.m.graham@gmail.com>
445445
Kelly Gerber <kellygerber22@yahoo.com>
446446
Ryan Doenges <rhdoenges@gmail.com>
447+
Sean Silva <chisophugis@gmail.com>
448+
Miroslav Bajtoš <miro.bajtos@gmail.com>
449+
Olof Johansson <olof@ethup.se>

‎ChangeLog‎

Lines changed: 74 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
2013.04.23, Version 0.10.5 (Stable)
2+
3+
* uv: Upgrade to 0.10.5 (isaacs)
4+
5+
* build: added support for Visual Studio 2012 (Miroslav Bajtoš)
6+
7+
* http: Don't try to destroy nonexistent sockets (isaacs)
8+
9+
* crypto: LazyTransform on properties, not methods (isaacs)
10+
11+
* assert: put info in err.message, not err.name (Ryan Doenges)
12+
13+
* dgram: fix no address bind() (Ben Noordhuis)
14+
15+
* handle_wrap: fix NULL pointer dereference (Ben Noordhuis)
16+
17+
* os: fix unlikely buffer overflow in os.type() (Ben Noordhuis)
18+
19+
* stream: Fix unshift() race conditions (isaacs)
20+
21+
122
2013.04.19, Version 0.11.1 (Unstable)
223

324
* V8: upgrade to 3.18.0
@@ -25,42 +46,7 @@
2546
* zlib: allow passing options to convenience methods (Kyle Robinson Young)
2647

2748

28-
2013.03.28, Version 0.11.0 (Unstable), bce38b3d74e64fcb7d04a2dd551151da6168cdc5
29-
30-
* V8: update to 3.17.13
31-
32-
* os: use %SystemRoot% or %windir% in os.tmpdir() (Suwon Chae)
33-
34-
* util: fix util.inspect() line width calculation (Marcin Kostrzewa)
35-
36-
* buffer: remove _charsWritten (Trevor Norris)
37-
38-
* fs: uv_[fl]stat now reports subsecond resolution (Timothy J Fontaine)
39-
40-
* fs: Throw if error raised and missing callback (bnoordhuis)
41-
42-
* tls: expose SSL_CTX_set_timeout via tls.createServer (Manav Rathi)
43-
44-
* tls: remove harmful unnecessary bounds checking (Marcel Laverdet)
45-
46-
* buffer: write ascii strings using WriteOneByte (Trevor Norris)
47-
48-
* dtrace: fix generation of v8 constants on freebsd (Fedor Indutny)
49-
50-
* dtrace: x64 ustack helper (Fedor Indutny)
51-
52-
* readline: handle wide characters properly (Nao Iizuka)
53-
54-
* repl: Use a domain to catch async errors safely (isaacs)
55-
56-
* repl: emit 'reset' event when context is reset (Sami Samhuri)
57-
58-
* util: custom `inspect()` method may return an Object (Nathan Rajlich)
59-
60-
* console: `console.dir()` bypasses inspect() methods (Nathan Rajlich)
61-
62-
63-
2013.04.11, Version 0.10.4 (Stable)
49+
2013.04.11, Version 0.10.4 (Stable), 9712aa9f76073c30850b20a188b1ed12ffb74d17
6450

6551
* uv: Upgrade to 0.10.4
6652

@@ -118,6 +104,41 @@
118104
* src: tie process.versions.uv to uv_version_string() (Ben Noordhuis)
119105

120106

107+
2013.03.28, Version 0.11.0 (Unstable), bce38b3d74e64fcb7d04a2dd551151da6168cdc5
108+
109+
* V8: update to 3.17.13
110+
111+
* os: use %SystemRoot% or %windir% in os.tmpdir() (Suwon Chae)
112+
113+
* util: fix util.inspect() line width calculation (Marcin Kostrzewa)
114+
115+
* buffer: remove _charsWritten (Trevor Norris)
116+
117+
* fs: uv_[fl]stat now reports subsecond resolution (Timothy J Fontaine)
118+
119+
* fs: Throw if error raised and missing callback (bnoordhuis)
120+
121+
* tls: expose SSL_CTX_set_timeout via tls.createServer (Manav Rathi)
122+
123+
* tls: remove harmful unnecessary bounds checking (Marcel Laverdet)
124+
125+
* buffer: write ascii strings using WriteOneByte (Trevor Norris)
126+
127+
* dtrace: fix generation of v8 constants on freebsd (Fedor Indutny)
128+
129+
* dtrace: x64 ustack helper (Fedor Indutny)
130+
131+
* readline: handle wide characters properly (Nao Iizuka)
132+
133+
* repl: Use a domain to catch async errors safely (isaacs)
134+
135+
* repl: emit 'reset' event when context is reset (Sami Samhuri)
136+
137+
* util: custom `inspect()` method may return an Object (Nathan Rajlich)
138+
139+
* console: `console.dir()` bypasses inspect() methods (Nathan Rajlich)
140+
141+
121142
2013.03.28, Version 0.10.2 (Stable), 1e0de9c426e07a260bbec2d2196c2d2db8eb8886
122143

123144
* npm: Upgrade to 1.2.15
@@ -684,6 +705,23 @@
684705
* Fix #3521 Make process.env more like a regular Object (isaacs)
685706

686707

708+
2013.04.09, Version 0.8.23 (maintenance), c67f8d0500fe15637a623eb759d2ad7eb9fb3b0b
709+
710+
* npm: Upgrade to v1.2.18
711+
712+
* http: Avoid EE warning on ECONNREFUSED handling (isaacs)
713+
714+
* tls: Re-enable check of CN-ID in cert verification (Tobias Müllerleile)
715+
716+
* child_process: fix sending utf-8 to child process (Ben Noordhuis)
717+
718+
* crypto: check key type in GetPeerCertificate() (Ben Noordhuis)
719+
720+
* win/openssl: mark assembled object files as seh safe (Bert Belder)
721+
722+
* windows/msi: fix msi build issue with WiX 3.7/3.8 (Raymond Feng)
723+
724+
687725
2013.03.07, Version 0.8.22 (Stable), 67a4cb4fe8c2346e30ffb83f7178e205cc2dab33
688726

689727
* npm: Update to 1.2.14

‎deps/openssl/README.chromium‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
Name: openssl
2+
URL: http://openssl.org/source/
3+
Version: 1.0.0f
4+
License: BSDish
5+
License File: openssl/LICENSE
6+
7+
Description:
8+
This is OpenSSL, the standard SSL/TLS library, which is used only in Android.
9+
10+
It's an unmodified, upstream source except for the patches listed below.
11+
12+
13+
********************************************************************************
14+
The following patches are taken from Android Open Source Project.
15+
16+
17+
progs.patch:
18+
19+
Fixup sources under the apps/ directory that are not built under the android environment.
20+
21+
22+
small_records.patch:
23+
24+
Reduce OpenSSL memory consumption.
25+
SSL records may be as large as 16K, but are typically < 2K. In
26+
addition, a historic bug in Windows allowed records to be as large
27+
32K. OpenSSL statically allocates read and write buffers (34K and
28+
18K respectively) used for processing records.
29+
With this patch, OpenSSL statically allocates 4K + 4K buffers, with
30+
the option of dynamically growing buffers to 34K + 4K, which is a
31+
saving of 44K per connection for the typical case.
32+
33+
34+
handshake_cutthrough.patch
35+
36+
Enables SSL3+ clients to send application data immediately following the
37+
Finished message even when negotiating full-handshakes. With this patch,
38+
clients can negotiate SSL connections in 1-RTT even when performing
39+
full-handshakes.
40+
41+
42+
jsse.patch
43+
44+
Support for JSSE implementation based on OpenSSL.
45+
46+
47+
npn.patch
48+
49+
Transport Layer Security (TLS) Next Protocol Negotiation Extension
50+
51+
52+
sha1_armv4_large.patch
53+
54+
This patch eliminates memory stores to addresses below SP.
55+
56+
57+
openssl_no_dtls1.patch
58+
59+
Add missing #ifndef OPENSSL_NO_DTLS1
60+
61+
62+
********************************************************************************
63+
The following patches are needed to compile this openssl on Chromium and pass
64+
the related net unit tests.
65+
66+
67+
empty_OPENSSL_cpuid_setup.patch
68+
69+
Use a empty implementation for function OPENSSL_cpuid_setup to resolve link
70+
error. We should figure out how to geenrate platform specific implementation
71+
of OPENSSL_cpuid_setup by leveraging crypto/*cpuid.pl.
72+
73+
74+
x509_hash_name_algorithm_change.patch
75+
76+
There are many symbolic links under /etc/ssl/certs created by using hash of
77+
the pem certificates in order for OpenSSL to find those certificate.
78+
Openssl has a tool to help you create hash symbolic links. (See tools/c_rehash)
79+
However the new openssl changed the hash algorithm, Unless you compile/install
80+
the latest openssl library and re-create all related symbolic links, the new
81+
openssl can not find some certificates because the links of those certificates
82+
were created by using old hash algorithm, which causes some tests failed.
83+
This patch gives a way to find a certificate according to its hash by using both
84+
new algorithm and old algorithm.
85+
crbug.com/111045 is used to track this issue.
86+
87+
88+
tls_exporter.patch
89+
90+
Keying Material Exporters for Transport Layer Security (RFC 5705).
91+
92+
93+
Android platform support
94+
95+
Copy config/android/openssl/opensslconf.h from Android's
96+
external/openssl/include/openssl/opensslconf.h

‎deps/openssl/asm/Makefile‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ PERL += -I../openssl/crypto/perlasm -I../openssl/crypto/bn/asm
44

55
OUTPUTS = \
66
x86-elf-gas/aes/aes-586.s \
7-
x86-elf-gas/aes/aesni-x86.s \
87
x86-elf-gas/bf/bf-686.s \
98
x86-elf-gas/bn/x86-mont.s \
109
x86-elf-gas/bn/x86.s \
@@ -22,20 +21,15 @@ OUTPUTS = \
2221
x86-elf-gas/whrlpool/wp-mmx.s \
2322
x86-elf-gas/x86cpuid.s \
2423
x64-elf-gas/aes/aes-x86_64.s \
25-
x64-elf-gas/aes/aesni-x86_64.s \
26-
x64-elf-gas/aes/aesni-sha1-x86_64.s \
27-
x64-elf-gas/bn/modexp512-x86_64.s \
2824
x64-elf-gas/bn/x86_64-mont.s \
2925
x64-elf-gas/camellia/cmll-x86_64.s \
3026
x64-elf-gas/md5/md5-x86_64.s \
3127
x64-elf-gas/rc4/rc4-x86_64.s \
32-
x64-elf-gas/rc4/rc4-md5-x86_64.s \
3328
x64-elf-gas/sha/sha1-x86_64.s \
3429
x64-elf-gas/sha/sha512-x86_64.s \
3530
x64-elf-gas/whrlpool/wp-x86_64.s \
3631
x64-elf-gas/x86_64cpuid.s \
3732
x86-macosx-gas/aes/aes-586.s \
38-
x86-macosx-gas/aes/aesni-x86.s \
3933
x86-macosx-gas/bf/bf-686.s \
4034
x86-macosx-gas/bn/x86-mont.s \
4135
x86-macosx-gas/bn/x86.s \
@@ -53,20 +47,15 @@ OUTPUTS = \
5347
x86-macosx-gas/whrlpool/wp-mmx.s \
5448
x86-macosx-gas/x86cpuid.s \
5549
x64-macosx-gas/aes/aes-x86_64.s \
56-
x64-macosx-gas/aes/aesni-x86_64.s \
57-
x64-macosx-gas/aes/aesni-sha1-x86_64.s \
58-
x64-macosx-gas/bn/modexp512-x86_64.s \
5950
x64-macosx-gas/bn/x86_64-mont.s \
6051
x64-macosx-gas/camellia/cmll-x86_64.s \
6152
x64-macosx-gas/md5/md5-x86_64.s \
6253
x64-macosx-gas/rc4/rc4-x86_64.s \
63-
x64-macosx-gas/rc4/rc4-md5-x86_64.s \
6454
x64-macosx-gas/sha/sha1-x86_64.s \
6555
x64-macosx-gas/sha/sha512-x86_64.s \
6656
x64-macosx-gas/whrlpool/wp-x86_64.s \
6757
x64-macosx-gas/x86_64cpuid.s \
6858
x86-win32-masm/aes/aes-586.asm \
69-
x86-win32-masm/aes/aesni-x86.asm \
7059
x86-win32-masm/bf/bf-686.asm \
7160
x86-win32-masm/bn/x86-mont.asm \
7261
x86-win32-masm/bn/x86.asm \
@@ -84,14 +73,10 @@ OUTPUTS = \
8473
x86-win32-masm/whrlpool/wp-mmx.asm \
8574
x86-win32-masm/x86cpuid.asm \
8675
x64-win32-masm/aes/aes-x86_64.asm \
87-
x64-win32-masm/aes/aesni-x86_64.asm \
88-
x64-win32-masm/aes/aesni-sha1-x86_64.asm \
89-
x64-win32-masm/bn/modexp512-x86_64.asm \
9076
x64-win32-masm/bn/x86_64-mont.asm \
9177
x64-win32-masm/camellia/cmll-x86_64.asm \
9278
x64-win32-masm/md5/md5-x86_64.asm \
9379
x64-win32-masm/rc4/rc4-x86_64.asm \
94-
x64-win32-masm/rc4/rc4-md5-x86_64.asm \
9580
x64-win32-masm/sha/sha1-x86_64.asm \
9681
x64-win32-masm/sha/sha512-x86_64.asm \
9782
x64-win32-masm/whrlpool/wp-x86_64.asm \
@@ -119,46 +104,33 @@ clean:
119104
find . -iname '*.s' -exec rm "{}" \;
120105

121106
x64-elf-gas/aes/aes-x86_64.s: ../openssl/crypto/aes/asm/aes-x86_64.pl
122-
x64-elf-gas/aes/aesni-x86_64.s: ../openssl/crypto/aes/asm/aesni-x86_64.pl
123-
x64-elf-gas/aes/aesni-sha1-x86_64.s: ../openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
124-
x64-elf-gas/bn/modexp512-x86_64.s: ../openssl/crypto/bn/asm/modexp512-x86_64.pl
125107
x64-elf-gas/bn/x86_64-mont.s: ../openssl/crypto/bn/asm/x86_64-mont.pl
126108
x64-elf-gas/camellia/cmll-x86_64.s: ../openssl/crypto/camellia/asm/cmll-x86_64.pl
127109
x64-elf-gas/md5/md5-x86_64.s: ../openssl/crypto/md5/asm/md5-x86_64.pl
128110
x64-elf-gas/rc4/rc4-x86_64.s: ../openssl/crypto/rc4/asm/rc4-x86_64.pl
129-
x64-elf-gas/rc4/rc4-md5-x86_64.s: ../openssl/crypto/rc4/asm/rc4-md5-x86_64.pl
130111
x64-elf-gas/sha/sha1-x86_64.s: ../openssl/crypto/sha/asm/sha1-x86_64.pl
131112
x64-elf-gas/sha/sha512-x86_64.s: ../openssl/crypto/sha/asm/sha512-x86_64.pl
132113
x64-elf-gas/whrlpool/wp-x86_64.s: ../openssl/crypto/whrlpool/asm/wp-x86_64.pl
133114
x64-elf-gas/x86_64cpuid.s: ../openssl/crypto/x86_64cpuid.pl
134115
x64-macosx-gas/aes/aes-x86_64.s: ../openssl/crypto/aes/asm/aes-x86_64.pl
135-
x64-macosx-gas/aes/aesni-x86_64.s: ../openssl/crypto/aes/asm/aesni-x86_64.pl
136-
x64-macosx-gas/aes/aesni-sha1-x86_64.s: ../openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
137-
x64-macosx-gas/bn/modexp512-x86_64.s: ../openssl/crypto/bn/asm/modexp512-x86_64.pl
138116
x64-macosx-gas/bn/x86_64-mont.s: ../openssl/crypto/bn/asm/x86_64-mont.pl
139117
x64-macosx-gas/camellia/cmll-x86_64.s: ../openssl/crypto/camellia/asm/cmll-x86_64.pl
140118
x64-macosx-gas/md5/md5-x86_64.s: ../openssl/crypto/md5/asm/md5-x86_64.pl
141119
x64-macosx-gas/rc4/rc4-x86_64.s: ../openssl/crypto/rc4/asm/rc4-x86_64.pl
142-
x64-macosx-gas/rc4/rc4-md5-x86_64.s: ../openssl/crypto/rc4/asm/rc4-md5-x86_64.pl
143120
x64-macosx-gas/sha/sha1-x86_64.s: ../openssl/crypto/sha/asm/sha1-x86_64.pl
144121
x64-macosx-gas/sha/sha512-x86_64.s: ../openssl/crypto/sha/asm/sha512-x86_64.pl
145122
x64-macosx-gas/whrlpool/wp-x86_64.s: ../openssl/crypto/whrlpool/asm/wp-x86_64.pl
146123
x64-macosx-gas/x86_64cpuid.s: ../openssl/crypto/x86_64cpuid.pl
147124
x64-win32-masm/aes/aes-x86_64.asm: ../openssl/crypto/aes/asm/aes-x86_64.pl
148-
x64-win32-masm/aes/aesni-x86_64.asm: ../openssl/crypto/aes/asm/aesni-x86_64.pl
149-
x64-win32-masm/aes/aesni-sha1-x86_64.asm: ../openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
150-
x64-win32-masm/bn/modexp512-x86_64.asm: ../openssl/crypto/bn/asm/modexp512-x86_64.pl
151125
x64-win32-masm/bn/x86_64-mont.asm: ../openssl/crypto/bn/asm/x86_64-mont.pl
152126
x64-win32-masm/camellia/cmll-x86_64.asm: ../openssl/crypto/camellia/asm/cmll-x86_64.pl
153127
x64-win32-masm/md5/md5-x86_64.asm: ../openssl/crypto/md5/asm/md5-x86_64.pl
154128
x64-win32-masm/rc4/rc4-x86_64.asm: ../openssl/crypto/rc4/asm/rc4-x86_64.pl
155-
x64-win32-masm/rc4/rc4-md5-x86_64.asm: ../openssl/crypto/rc4/asm/rc4-md5-x86_64.pl
156129
x64-win32-masm/sha/sha1-x86_64.asm: ../openssl/crypto/sha/asm/sha1-x86_64.pl
157130
x64-win32-masm/sha/sha512-x86_64.asm: ../openssl/crypto/sha/asm/sha512-x86_64.pl
158131
x64-win32-masm/whrlpool/wp-x86_64.asm: ../openssl/crypto/whrlpool/asm/wp-x86_64.pl
159132
x64-win32-masm/x86_64cpuid.asm: ../openssl/crypto/x86_64cpuid.pl
160133
x86-elf-gas/aes/aes-586.s: ../openssl/crypto/aes/asm/aes-586.pl
161-
x86-elf-gas/aes/aesni-x86.s: ../openssl/crypto/aes/asm/aesni-x86.pl
162134
x86-elf-gas/bf/bf-686.s: ../openssl/crypto/bf/asm/bf-686.pl
163135
x86-elf-gas/bn/x86-mont.s: ../openssl/crypto/bn/asm/x86-mont.pl
164136
x86-elf-gas/bn/x86.s: ../openssl/crypto/bn/asm/x86.pl
@@ -176,7 +148,6 @@ x86-elf-gas/sha/sha512-586.s: ../openssl/crypto/sha/asm/sha512-586.pl
176148
x86-elf-gas/whrlpool/wp-mmx.s: ../openssl/crypto/whrlpool/asm/wp-mmx.pl
177149
x86-elf-gas/x86cpuid.s: ../openssl/crypto/x86cpuid.pl
178150
x86-macosx-gas/aes/aes-586.s: ../openssl/crypto/aes/asm/aes-586.pl
179-
x86-macosx-gas/aes/aesni-x86.s: ../openssl/crypto/aes/asm/aesni-x86.pl
180151
x86-macosx-gas/bf/bf-686.s: ../openssl/crypto/bf/asm/bf-686.pl
181152
x86-macosx-gas/bn/x86-mont.s: ../openssl/crypto/bn/asm/x86-mont.pl
182153
x86-macosx-gas/bn/x86.s: ../openssl/crypto/bn/asm/x86.pl
@@ -194,7 +165,6 @@ x86-macosx-gas/sha/sha512-586.s: ../openssl/crypto/sha/asm/sha512-586.pl
194165
x86-macosx-gas/whrlpool/wp-mmx.s: ../openssl/crypto/whrlpool/asm/wp-mmx.pl
195166
x86-macosx-gas/x86cpuid.s: ../openssl/crypto/x86cpuid.pl
196167
x86-win32-masm/aes/aes-586.asm: ../openssl/crypto/aes/asm/aes-586.pl
197-
x86-win32-masm/aes/aesni-x86.asm: ../openssl/crypto/aes/asm/aesni-x86.pl
198168
x86-win32-masm/bf/bf-686.asm: ../openssl/crypto/bf/asm/bf-686.pl
199169
x86-win32-masm/bn/x86.asm: ../openssl/crypto/bn/asm/x86.pl
200170
x86-win32-masm/bn/x86-mont.asm: ../openssl/crypto/bn/asm/x86-mont.pl

0 commit comments

Comments
 (0)