Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/v0.10' into v0.12
Browse files Browse the repository at this point in the history
Conflicts:
	ChangeLog
	deps/v8/src/hydrogen.cc
	lib/http.js
	lib/querystring.js
	src/node_crypto.cc
	src/node_version.h
	test/simple/test-querystring.js
  • Loading branch information
tjfontaine committed Sep 17, 2014
2 parents 21e6064 + 84952da commit 7ca5af8
Show file tree
Hide file tree
Showing 585 changed files with 26,642 additions and 8,452 deletions.
6 changes: 6 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -562,3 +562,9 @@ Oguz Bastemur <[email protected]>
Maurice Butler <[email protected]>
Chris Dickinson <[email protected]>
Julien Gilli <[email protected]>
Jakob Gillich <[email protected]>
James Halliday <[email protected]>
Kevin Simper <[email protected]>
Jackson Tian <[email protected]>
Tristan Berger <[email protected]>
Mathias Schreck <[email protected]>
34 changes: 34 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,40 @@
* console: `console.dir()` bypasses inspect() methods (Nathan Rajlich)


2014.09.16, Version 0.10.32 (Stable)

* npm: Update to 1.4.28

* v8: fix a crash introduced by previous release (Fedor Indutny)

* configure: add --openssl-no-asm flag (Fedor Indutny)

* crypto: use domains for any callback-taking method (Chris Dickinson)

* http: do not send `0\r\n\r\n` in TE HEAD responses (Fedor Indutny)

* querystring: fix unescape override (Tristan Berger)

* url: Add support for RFC 3490 separators (Mathias Bynens)


2014.08.19, Version 0.10.31 (Stable), 7fabdc23d843cb705d2d0739e7bbdaaf50aa3292

* v8: backport CVE-2013-6668

* openssl: Update to v1.0.1i

* npm: Update to v1.4.23

* cluster: disconnect should not be synchronous (Sam Roberts)

* fs: fix fs.readFileSync fd leak when get RangeError (Jackson Tian)

* stream: fix Readable.wrap objectMode falsy values (James Halliday)

* timers: fix timers with non-integer delay hanging. (Julien Gilli)


2014.07.31, Version 0.10.30 (Stable), bc0ff830aff1e016163d855e86ded5c98b0899e8

* uv: Upgrade to v0.10.28
Expand Down
5 changes: 5 additions & 0 deletions common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,11 @@
}],
['OS=="freebsd" and node_use_dtrace=="true"', {
'libraries': [ '-lelf' ],
}],
['OS=="freebsd"', {
'ldflags': [
'-Wl,--export-dynamic',
],
}]
],
}
Expand Down
7 changes: 7 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ parser.add_option("--fully-static",
help="Generate an executable without external dynamic libraries. This "
"will not work on OSX when using default compilation environment")

parser.add_option("--openssl-no-asm",
action="store_true",
dest="openssl_no_asm",
help="Do not build optimized assembly for OpenSSL")

# deprecated
parser.add_option('--openssl-includes',
action='store',
Expand Down Expand Up @@ -629,6 +634,8 @@ def configure_v8(o):
def configure_openssl(o):
o['variables']['node_use_openssl'] = b(not options.without_ssl)
o['variables']['node_shared_openssl'] = b(options.shared_openssl)
o['variables']['openssl_no_asm'] = (
1 if options.openssl_no_asm else 0)

if options.without_ssl:
return
Expand Down
18 changes: 0 additions & 18 deletions deps/npm/.eslintrc

This file was deleted.

Loading

0 comments on commit 7ca5af8

Please sign in to comment.