platform/upstream/nodejs.git
12 years agouv: upgrade to e7758e1
Fedor Indutny [Mon, 16 Jan 2012 14:18:37 +0000 (20:18 +0600)]
uv: upgrade to e7758e1

12 years agoRevert "util: always display a warning for module in debug mode"
Fedor Indutny [Mon, 16 Jan 2012 13:33:16 +0000 (19:33 +0600)]
Revert "util: always display a warning for module in debug mode"

This reverts commit df62005ece4bb0be0d5af645fd9093b1506ce63d.

12 years agoutil: always display a warning for module in debug mode
Maciej Małecki [Mon, 16 Jan 2012 12:54:35 +0000 (13:54 +0100)]
util: always display a warning for module in debug mode

12 years agoquerystring: fix maxKeys = 0 is ignored
Fedor Indutny [Mon, 16 Jan 2012 10:13:43 +0000 (16:13 +0600)]
querystring: fix maxKeys = 0 is ignored

12 years agohttp: do not accept headers if limit is exceeded
Fedor Indutny [Mon, 16 Jan 2012 10:11:29 +0000 (16:11 +0600)]
http: do not accept headers if limit is exceeded

* fix limiting when parser was reused
* fix maxHeadersCount = 0 is ignored ( credit to @koichik )
* add test-http-max-headers-count.js ( credit to @koichik )

12 years agoisolates: remove references to uv_thread_self()
Ben Noordhuis [Mon, 16 Jan 2012 00:41:26 +0000 (01:41 +0100)]
isolates: remove references to uv_thread_self()

uv_thread_self() is difficult to implement on Windows in a way where the return
value is valid across threads. It's already been removed from upstream libuv.

12 years agohttp, querystring: added limits to prevent DoS
Fedor Indutny [Sun, 15 Jan 2012 19:45:31 +0000 (01:45 +0600)]
http, querystring: added limits to prevent DoS

12 years agobuild: support --dest-cpu configure switch again
Ben Noordhuis [Sun, 15 Jan 2012 15:50:58 +0000 (16:50 +0100)]
build: support --dest-cpu configure switch again

12 years agotest-eio-limit: add missing copyright headers
Fedor Indutny [Sat, 14 Jan 2012 17:51:53 +0000 (23:51 +0600)]
test-eio-limit: add missing copyright headers

12 years agoAdd failing test-eio-limit.js
Fedor Indutny [Sat, 14 Jan 2012 17:48:56 +0000 (23:48 +0600)]
Add failing test-eio-limit.js

12 years agobuild: remove the old -DPLATFORM="mac" define
Nathan Rajlich [Wed, 11 Jan 2012 22:44:39 +0000 (14:44 -0800)]
build: remove the old -DPLATFORM="mac" define

To prevent redefinition warnings.

12 years agobuild: set `process.platform` to "darwin" on OS X
Nathan Rajlich [Wed, 11 Jan 2012 22:36:27 +0000 (14:36 -0800)]
build: set `process.platform` to "darwin" on OS X

This is consistent with the old waf build system, and doesn't break old scripts
that are expecting the value to be "darwin".

Fixes #2518.

12 years agohttp: Upgrade/CONNECT request should detach its socket earlier
koichik [Thu, 12 Jan 2012 05:16:03 +0000 (14:16 +0900)]
http: Upgrade/CONNECT request should detach its socket earlier

With Upgrade or CONNECT request, http.ClientRequest emits 'close' event
after its socket is closed. However, after receiving a response, the socket
is not under management by the request.

http.ClientRequest should detach the socket before 'upgrade'/'connect'
event is emitted to pass the socket to a user. After that, it should
emit 'close' event immediately without waiting for closing of the socket.

Fixes #2510.

12 years agozlib: reset() method for deflate/inflate streams
Fedor Indutny [Wed, 11 Jan 2012 21:12:13 +0000 (03:12 +0600)]
zlib: reset() method for deflate/inflate streams

* ammended test-zlib-dictionary to cover reusing streams

12 years agozlib: C++ style fixes for dictionary
Fedor Indutny [Wed, 11 Jan 2012 21:11:31 +0000 (03:11 +0600)]
zlib: C++ style fixes for dictionary

12 years agoMerge branch 'v0.6'
Fedor Indutny [Wed, 11 Jan 2012 20:17:44 +0000 (02:17 +0600)]
Merge branch 'v0.6'

Conflicts:
src/handle_wrap.cc
src/node_zlib.cc
src/process_wrap.cc

12 years agozlib: C++ style fixes
Fedor Indutny [Wed, 11 Jan 2012 17:46:10 +0000 (23:46 +0600)]
zlib: C++ style fixes

12 years agopunycode: Update to v0.3.0
Mathias Bynens [Tue, 3 Jan 2012 09:14:02 +0000 (10:14 +0100)]
punycode: Update to v0.3.0

12 years agomakefile: ignore `lib/punycode.js` while linting
Maciej Małecki [Tue, 10 Jan 2012 22:29:11 +0000 (23:29 +0100)]
makefile: ignore `lib/punycode.js` while linting

`punycode` is a third party code which generates a lot of lint errors.
Upstream was contacted in order to fix it in bestiejs/punycode.js#6, but
request was denied.

Therefore, it's reasonable to exclude this file from linting process.

Ref #2456.

12 years agochild_process: fix typo in internal message event name
Andreas Madsen [Wed, 11 Jan 2012 08:02:51 +0000 (09:02 +0100)]
child_process: fix typo in internal message event name

12 years agozlib binding cleanup
isaacs [Tue, 10 Jan 2012 20:07:30 +0000 (12:07 -0800)]
zlib binding cleanup

* Add assert to prevent parallel writes
* Embed request object instead of using new/delete
* Remove unnecessary WorkReqWrap in favor of uv_work_t
* Use container_of instead of req->data

Along with 2d8af39accc6e1a863aa60ed80289508f3df50e8 and
0ad2717fd88e5ddd28a1c245c78b37bfe9aa4197, this should Fix #2504.

12 years agoUse .jpg instead of .bmp for .msi
Ryan Dahl [Tue, 10 Jan 2012 20:13:48 +0000 (12:13 -0800)]
Use .jpg instead of .bmp for .msi

smaller.

12 years agochild_process: fix typo in internal message event name
Maciej Małecki [Tue, 10 Jan 2012 22:07:12 +0000 (23:07 +0100)]
child_process: fix typo in internal message event name

12 years agoAdd broken test-isolates3.js
Ryan Dahl [Tue, 10 Jan 2012 20:04:16 +0000 (12:04 -0800)]
Add broken test-isolates3.js

12 years agoMake sure that zlib contexts are not garbage collected when busy
Ben Noordhuis [Tue, 10 Jan 2012 19:54:40 +0000 (20:54 +0100)]
Make sure that zlib contexts are not garbage collected when busy

12 years agoFix memory leak in node_zlib
Bert Belder [Tue, 10 Jan 2012 19:51:45 +0000 (20:51 +0100)]
Fix memory leak in node_zlib

12 years agoAdd failing test-isolates2.js
Ryan Dahl [Tue, 10 Jan 2012 19:47:32 +0000 (11:47 -0800)]
Add failing test-isolates2.js

12 years agoFix #2473
Ryan Dahl [Mon, 9 Jan 2012 23:29:15 +0000 (15:29 -0800)]
Fix #2473

Tested in production.

See also http://code.google.com/p/v8/issues/detail?id=1889

12 years agotest: make debugger-repl tests work with isolates
Fedor Indutny [Tue, 10 Jan 2012 14:56:30 +0000 (20:56 +0600)]
test: make debugger-repl tests work with isolates

12 years agoisolates: add process-global list of isolates
Ben Noordhuis [Tue, 10 Jan 2012 15:46:06 +0000 (16:46 +0100)]
isolates: add process-global list of isolates

12 years agodebug threads
Fedor Indutny [Fri, 6 Jan 2012 18:28:20 +0000 (00:28 +0600)]
debug threads

12 years agoIsolateDebugger C++
Fedor Indutny [Fri, 6 Jan 2012 18:27:55 +0000 (00:27 +0600)]
IsolateDebugger C++

12 years agofixed debugger segfaults
Fedor Indutny [Fri, 6 Jan 2012 18:26:53 +0000 (00:26 +0600)]
fixed debugger segfaults

12 years agoadded isolates support
Fedor Indutny [Fri, 6 Jan 2012 18:24:41 +0000 (00:24 +0600)]
added isolates support

12 years agoisolates: drain message queue completely
Ben Noordhuis [Tue, 10 Jan 2012 01:08:42 +0000 (02:08 +0100)]
isolates: drain message queue completely

12 years agoImprove test-child-process-silent
Andreas Madsen [Wed, 4 Jan 2012 14:28:13 +0000 (15:28 +0100)]
Improve test-child-process-silent

12 years agorequire('sys') now throws
Ryan Dahl [Mon, 9 Jan 2012 20:59:26 +0000 (12:59 -0800)]
require('sys') now throws

To be removed in v0.9

12 years agochild_process: fix segfault after failed spawn
Ben Noordhuis [Mon, 9 Jan 2012 19:42:11 +0000 (20:42 +0100)]
child_process: fix segfault after failed spawn

The process handle is uninitialized when uv_spawn() fails so don't export the
handle to JS land when that happens. Attempts to close the uninitialized handle
resulted in segmentation faults and memory corruption.

Fixes #2481.

12 years agohandle_wrap: guard against uninitialized handle or double close
Ben Noordhuis [Mon, 9 Jan 2012 19:39:06 +0000 (20:39 +0100)]
handle_wrap: guard against uninitialized handle or double close

12 years agoMerge remote branch 'origin/v0.6'
Ryan Dahl [Mon, 9 Jan 2012 19:20:22 +0000 (11:20 -0800)]
Merge remote branch 'origin/v0.6'

Conflicts:
Makefile
configure
src/node_version.h

12 years agouv: upgrade to 803f5a0
Ben Noordhuis [Mon, 9 Jan 2012 14:45:51 +0000 (15:45 +0100)]
uv: upgrade to 803f5a0

12 years agoevents: fix checking max listeners with `1`
Ryunosuke SATO [Sun, 8 Jan 2012 15:53:17 +0000 (00:53 +0900)]
events: fix checking max listeners with `1`

Fixes #2490.

12 years agohttp: better support for CONNECT method.
koichik [Mon, 9 Jan 2012 02:51:06 +0000 (03:51 +0100)]
http: better support for CONNECT method.

Introduces 'connect' event on both client (http.ClientRequest) and
server (http.Server).

Refs: #2259, #2474.
Fixes #1576.

12 years agotls: Allow establishing secure connection on the existing socket
koichik [Mon, 9 Jan 2012 01:28:49 +0000 (02:28 +0100)]
tls: Allow establishing secure connection on the existing socket

This is necessary to use SSL over HTTP tunnels.

Refs #2259, #2474.
Fixes #2489.

12 years agonet: make connect() accept options
koichik [Mon, 9 Jan 2012 01:18:39 +0000 (02:18 +0100)]
net: make connect() accept options

This makes API even with tls.connect().
Refs #1983.

See also:
http://groups.google.com/group/nodejs-dev/msg/3b6dbcc4a9a82d99

Fixes #2487.

12 years agoAvoid unnecessary buffer to string conversion.
Ben Noordhuis [Sun, 8 Jan 2012 23:45:19 +0000 (00:45 +0100)]
Avoid unnecessary buffer to string conversion.

Speeds up the benchmark below by about 680% (0.5s versus 3.4s on my Core 2 Duo).

    var crypto = require('crypto');
    var hash = crypto.createHash('sha1');
    var data = new Buffer(1024);
    for (var i = 0; i < 128 * 1024; ++i) hash.update(data);

Fixes #2494.

12 years agobuild: honour the PYTHON environment variable
Ben Noordhuis [Sun, 8 Jan 2012 20:17:28 +0000 (21:17 +0100)]
build: honour the PYTHON environment variable

Overrides the path to the python binary. Defaults to `python`.

12 years agotls doc: update docs to reflect API change
Maciej Małecki [Wed, 2 Nov 2011 00:27:50 +0000 (01:27 +0100)]
tls doc: update docs to reflect API change

Refs #1983.

12 years agotest tls: make tests use new `tls.connect` API
Maciej Małecki [Tue, 1 Nov 2011 15:28:04 +0000 (16:28 +0100)]
test tls: make tests use new `tls.connect` API

Refs #1983.

12 years agohttps: make `https` use new `tls.connect` API
Maciej Małecki [Tue, 1 Nov 2011 15:27:42 +0000 (16:27 +0100)]
https: make `https` use new `tls.connect` API

Refs #1983.

12 years agotls: make `tls.connect` accept port and host in `options`
Maciej Małecki [Tue, 1 Nov 2011 15:23:30 +0000 (16:23 +0100)]
tls: make `tls.connect` accept port and host in `options`

Previous API used form:

    tls.connect(443, "google.com", options, ...)

now it's replaced with:

    tls.connect({port: 443, host: "google.com", ...}, ...)

It simplifies argument parsing in `tls.connect` and makes the API
consistent with other parts.

Fixes #1983.

12 years agodocs: fix ChangeLog
koichik [Sat, 7 Jan 2012 06:51:51 +0000 (07:51 +0100)]
docs: fix ChangeLog

12 years agodocs: small changes.
koichik [Sat, 7 Jan 2012 05:44:35 +0000 (06:44 +0100)]
docs: small changes.

12 years agoNow working on v0.6.8
isaacs [Sat, 7 Jan 2012 01:36:39 +0000 (17:36 -0800)]
Now working on v0.6.8

12 years ago2012.01.06, Version 0.6.7 (stable) v0.6.7
isaacs [Thu, 5 Jan 2012 23:44:04 +0000 (15:44 -0800)]
2012.01.06, Version 0.6.7 (stable)

* V8 hash collision fix (Breaks MIPS) (Bert Belder, Erik Corry)

* Upgrade V8 to 3.6.6.15

* Upgrade npm to 1.1.0-beta-10 (isaacs)

* many doc updates (Ben Noordhuis, Jeremy Martin, koichik, Dave Irvine,
  Seong-Rak Choi, Shannen, Adam Malcontenti-Wilson, koichik)

* Fix segfault in node_http_parser.cc

* dgram, timers: fix memory leaks (Ben Noordhuis, Yoshihiro Kukuchi)

* repl: fix repl.start not passing the `ignoreUndefined` arg (Damon Oehlman)

* #1980: Socket.pause null reference when called on a closed Stream (koichik)

* #2263: XMLHttpRequest piped in a writable file stream hang (koichik)

* #2069: http resource leak (koichik)

* buffer.readInt global pollution fix (Phil Sung)

* timers: fix performance regression (Ben Noordhuis)

* #2308, #2246: node swallows openssl error on request (koichik)

* #2114: timers: remove _idleTimeout from item in .unenroll() (James Hartig)

* #2379: debugger: Request backtrace w/o refs (Fedor Indutny)

* simple DTrace ustack helper (Dave Pacheco)

* crypto: rewrite HexDecode without snprintf (Roman Shtylman)

* crypto: don't ignore DH init errors (Ben Noordhuis)

12 years agoRemove snapshot from Mac binary build
isaacs [Sat, 7 Jan 2012 00:30:46 +0000 (16:30 -0800)]
Remove snapshot from Mac binary build

12 years agosupport nosnapshot in vcbuild.bat
Ryan Dahl [Sat, 7 Jan 2012 00:20:45 +0000 (16:20 -0800)]
support nosnapshot in vcbuild.bat

12 years agoUpgrade V8 to 3.8.5
Ryan Dahl [Fri, 6 Jan 2012 21:03:06 +0000 (13:03 -0800)]
Upgrade V8 to 3.8.5

12 years agoRevert "crypto: add SecureContext.clearOptions() method"
Ryan Dahl [Fri, 6 Jan 2012 20:00:36 +0000 (12:00 -0800)]
Revert "crypto: add SecureContext.clearOptions() method"

API addition needs to go in master. Also openssl-0.9.8k doesn't have
SSL_CTX_clear_options().

This reverts commit 6f8839d2ac362ced42235a34a023af5e2c656501.

12 years agofix test-sys for hash randomization
Ryan Dahl [Fri, 6 Jan 2012 18:22:18 +0000 (10:22 -0800)]
fix test-sys for hash randomization

broken in 4a899c92742583ca9e0bb7d16e09a66b08c9d033

12 years agoLand hash collision fix for V8 3.6 by Erik Corry.
Bert Belder [Fri, 6 Jan 2012 16:02:01 +0000 (17:02 +0100)]
Land hash collision fix for V8 3.6 by Erik Corry.

- If V8 snapshots are enabled then the hash is only randomized at build time.
- Breaks MIPS

---
Backport hash collision workaround to 3.6.
This is made up of 9956, 10351, 10338 and 10330.
This change bakes the string hash key into the snapshot, so
it is determined at build time for shapshot configs.
Review URL: http://codereview.chromium.org/9124004

12 years agohttp: fix ServerResponse does not emit 'close'
koichik [Thu, 5 Jan 2012 11:50:03 +0000 (20:50 +0900)]
http: fix ServerResponse does not emit 'close'

Refs #2453.

12 years agochild_process: add isolates support
Ben Noordhuis [Thu, 5 Jan 2012 23:42:10 +0000 (00:42 +0100)]
child_process: add isolates support

Passing an options object with {thread:true} to .fork() or .spawn() will run the
target script in a thread instead of a separate process.

12 years agoisolates: remove global isolates list
Ben Noordhuis [Thu, 5 Jan 2012 00:12:48 +0000 (01:12 +0100)]
isolates: remove global isolates list

No longer necessary, each isolate now waits until its subordinate isolates have
exited.

12 years agoisolates: implement message passing
Ben Noordhuis [Thu, 5 Jan 2012 00:02:59 +0000 (01:02 +0100)]
isolates: implement message passing

Parent and child isolates can now pass arbitrary binary messages between each
other. The messages are sent and received through a thread-safe queue that
wakes up the event loop of the receiving thread.

12 years agouv: upgrade to 56a31f0
Ben Noordhuis [Tue, 3 Jan 2012 14:15:54 +0000 (15:15 +0100)]
uv: upgrade to 56a31f0

12 years agofs: add appendFile() and appendFileSync() functions
Emerson Macedo [Wed, 2 Nov 2011 18:06:16 +0000 (16:06 -0200)]
fs: add appendFile() and appendFileSync() functions

12 years agotyped arrays: add Buffer -> TypedArray constructor
Mikael Bourges-Sevenier [Sat, 31 Dec 2011 08:30:42 +0000 (00:30 -0800)]
typed arrays: add Buffer -> TypedArray constructor

- create a typed array from a node::Buffer object
- update TypedArray::set() to spec
- add TypedArray::get() method

12 years agonpm@1.1.0-beta-10
isaacs [Wed, 4 Jan 2012 23:09:13 +0000 (15:09 -0800)]
npm@1.1.0-beta-10

12 years agobuild: compile without -fvisibility=hidden
Shigeki Ohtsu [Thu, 5 Jan 2012 12:25:07 +0000 (21:25 +0900)]
build: compile without -fvisibility=hidden

Fixes symbol lookup errors when loading an addon module on Linux.

12 years agobuild: set product_prefix to empty for Linux
Shigeki Ohtsu [Thu, 5 Jan 2012 12:01:29 +0000 (21:01 +0900)]
build: set product_prefix to empty for Linux

12 years agodocs: mention that python 2.6 or 2.7 is required
Ben Noordhuis [Thu, 5 Jan 2012 15:44:11 +0000 (16:44 +0100)]
docs: mention that python 2.6 or 2.7 is required

12 years agohttp: use `self` insted of `this`
koichik [Thu, 5 Jan 2012 08:43:00 +0000 (17:43 +0900)]
http: use `self` insted of `this`

12 years agotypos
Andreas Madsen [Thu, 5 Jan 2012 07:57:54 +0000 (08:57 +0100)]
typos

fixes #2465

12 years agocluster improvements: Worker class and isolate internal messages
Andreas Madsen [Tue, 20 Dec 2011 09:42:48 +0000 (10:42 +0100)]
cluster improvements: Worker class and isolate internal messages

Fixes #2388

12 years agoUpdate address in CLA
Ryan Dahl [Wed, 4 Jan 2012 19:20:50 +0000 (11:20 -0800)]
Update address in CLA

12 years agobuild: fix npm-cli.js install
Ben Noordhuis [Wed, 4 Jan 2012 15:36:08 +0000 (16:36 +0100)]
build: fix npm-cli.js install

12 years agoPotential fix for #2438
Ryan Dahl [Fri, 30 Dec 2011 00:06:14 +0000 (16:06 -0800)]
Potential fix for #2438

- Save StringPtr if the header hasn't been completely received yet after one
  packet.
- Add one to num_fields and num_values. They were actually one less than the
  number of fields and values.
- Remove always_inline makes debugging difficult, and has negligible
  performance benefits.

12 years agoAdd another test to test-http-parser-bad-ref.js demoing #2438
Ryan Dahl [Wed, 4 Jan 2012 01:14:58 +0000 (17:14 -0800)]
Add another test to test-http-parser-bad-ref.js demoing #2438

12 years agoUpgrade V8 to 3.8.4
Ryan Dahl [Tue, 3 Jan 2012 19:46:53 +0000 (11:46 -0800)]
Upgrade V8 to 3.8.4

12 years agoMerge remote-tracking branch 'origin/v0.6'
Ben Noordhuis [Mon, 2 Jan 2012 11:29:39 +0000 (12:29 +0100)]
Merge remote-tracking branch 'origin/v0.6'

Conflicts:
src/udp_wrap.cc

12 years agocrypto: add SecureContext.clearOptions() method
Ben Noordhuis [Mon, 2 Jan 2012 11:02:05 +0000 (12:02 +0100)]
crypto: add SecureContext.clearOptions() method

SecureContext.setOptions() is backed by SSL_CTX_set_options() which, contrary to
what the name suggests, is additive: it doesn't set options, it adds them to the
already active options.

Hence the need for SecureContext.clearOptions(), which lets you unset active
options.

12 years agotest: add #2293 regression test
Ben Noordhuis [Mon, 2 Jan 2012 09:48:33 +0000 (10:48 +0100)]
test: add #2293 regression test

Creating a file event watcher with fs.watch({persistent:false}) should not block
the event loop.

12 years agouv: upgrade to 38fc6ad
Ben Noordhuis [Mon, 2 Jan 2012 09:43:10 +0000 (10:43 +0100)]
uv: upgrade to 38fc6ad

12 years agodocs: fix typo on community page
Ben Noordhuis [Sun, 1 Jan 2012 22:36:03 +0000 (23:36 +0100)]
docs: fix typo on community page

12 years agoFix #2034 repl message for .clear when useGlobal=true
isaacs [Tue, 8 Nov 2011 00:10:21 +0000 (16:10 -0800)]
Fix #2034 repl message for .clear when useGlobal=true

12 years agotest: don't create temp files in fixtures dir
Ben Noordhuis [Sat, 31 Dec 2011 02:16:04 +0000 (03:16 +0100)]
test: don't create temp files in fixtures dir

12 years agobench: add /echo endpoint to http_simple
Ben Noordhuis [Fri, 30 Dec 2011 01:03:08 +0000 (02:03 +0100)]
bench: add /echo endpoint to http_simple

Copies the POST request data verbatim into the response body.

12 years agoAdd test for #2438
Ryan Dahl [Thu, 29 Dec 2011 21:36:13 +0000 (13:36 -0800)]
Add test for #2438

Unfortunately valgrind must be used to see the bad read. It would be nice if
we could improve this test to cause a segfault.

12 years agoMerge remote branch 'origin/isolates2'
Ryan Dahl [Thu, 29 Dec 2011 19:57:40 +0000 (11:57 -0800)]
Merge remote branch 'origin/isolates2'

12 years agonet: defer net.Server 'close' event to next tick
Ben Noordhuis [Thu, 29 Dec 2011 18:30:07 +0000 (19:30 +0100)]
net: defer net.Server 'close' event to next tick

12 years agodgram: fix memory leak in error path
Ben Noordhuis [Thu, 29 Dec 2011 13:57:53 +0000 (14:57 +0100)]
dgram: fix memory leak in error path

12 years agorepl: fix repl.start not passing the `ignoreUndefined` arg to the REPLServer constructor
Damon Oehlman [Thu, 29 Dec 2011 02:15:49 +0000 (12:15 +1000)]
repl: fix repl.start not passing the `ignoreUndefined` arg to the REPLServer constructor

12 years agodocs: tiny typo in http.markdown
Jeremy Martin [Wed, 28 Dec 2011 20:14:30 +0000 (15:14 -0500)]
docs: tiny typo in http.markdown

12 years agoMerge branch 'isolates2'
Ben Noordhuis [Thu, 29 Dec 2011 00:56:58 +0000 (01:56 +0100)]
Merge branch 'isolates2'

12 years agoMerge branch 'v0.6'
Ben Noordhuis [Thu, 29 Dec 2011 00:49:10 +0000 (01:49 +0100)]
Merge branch 'v0.6'

Conflicts:
src/platform_win32.cc

12 years agoInclude ngx-queue.h, fix Windows build.
Ben Noordhuis [Wed, 28 Dec 2011 23:40:40 +0000 (00:40 +0100)]
Include ngx-queue.h, fix Windows build.

12 years agouv: upgrade to 85f6b79
Ben Noordhuis [Wed, 28 Dec 2011 23:18:23 +0000 (00:18 +0100)]
uv: upgrade to 85f6b79

12 years agoMake msbuild run in parallel.
Ben Noordhuis [Wed, 28 Dec 2011 22:56:53 +0000 (23:56 +0100)]
Make msbuild run in parallel.

12 years agoAdd isolate version of test-child-process-fork
Ryan Dahl [Wed, 28 Dec 2011 02:11:32 +0000 (18:11 -0800)]
Add isolate version of test-child-process-fork