summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 2015.01.29, Version 0.11.16 (Unstable)v0.11.16v0.11.16-releaseJulien Gilli2015-01-292-1/+16
| | | | | | | | | | | | | | * openssl: Upgrade to 1.0.1l * npm: Upgrade to 2.3.0 * url: revert support of `path` for url.format" (Julien Gilli) * assert: use util.inspect() to create error messages (cjihrig) * net: throw on invalid socket timeouts (cjihrig) * url: fix parsing of ssh urls (Evan Lucas)
* src: make build pass with GCC < 4.5Julien Gilli2015-01-299-8/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | Building node with GCC > 4.4 on CentOS makes the node binary depend on a more recent version of the C/C++ runtime that is not installed by default on these older CentOS platforms, and probably on other platforms as well. Building node with the default gcc and g++ compilers that come with these older versions of CentOS allows to ship a node binary that runs out of the box on these setups with older C/C++ runtimes. This change works around a bug that was fixed in GCC 4.5. Versions of GCC < 4.5 would not support using the injected-class-name of a template base class as a type name. This change also disables aliasing optimizations for toolchains using GCC <= 4.4 as they're not able to deal with the aliasing in the queue implementation used by libuv and node (see src/queue.h). Fixes #9079. PR: #9098 PR-URL: https://github.com/joyent/node/pull/9098 Reviewed-By: Timothy J Fontaine <tjfontaine@gmail.com> Reviewed-By: Trevor Norris <trev.norris@gmail.com>
* assert: use util.inspect() to create error messagescjihrig2015-01-292-28/+19
| | | | | | | | | | | | Currently, JSON.stringify() is used to create error messages on failed assertions. This causes an error when stringifying objects with circular references. This commit switches out JSON.stringify() for util.inspect(), which can handle circular references. PR: #8734 PR-URL: https://github.com/joyent/node/pull/8734 Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
* Revert "url: support `path` for url.format"Julien Gilli2015-01-293-100/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d312b6d15c69cf4c438ed7d884e6396c481a57f6. d312b6d15c69cf4c438ed7d884e6396c481a57f6 introduced some confusion in the existing API of url.format and url.parse. The way the 'path' property overrides other properties in url.format's input is too confusing for existing users compared to the issues it fixes. Fixes such as https://github.com/joyent/node/pull/9081 have been proposed, but they do not make the API less confusing. Instead, this change just reverts the original breaking change so that it gives us more time after v0.12.0 is released to come up with a better API for url.format, url.parse and other related APIs in the v0.13 development branch. Fixes #9070. Conflicts: doc/api/url.markdown PR: #9109 PR-URL: https://github.com/joyent/node/pull/9109 Reviewed-By: Timothy J Fontaine <tjfontaine@gmail.com>
* deps: upgrade npm to 2.3.0Forrest L Norvell2015-01-27705-8490/+30689
| | | | | | | PR: #9086 PR-URL: https://github.com/joyent/node/pull/9086 Reviewed-By: Julien Gilli <julien.gilli@joyent.com> Reviewed-By: Timothy J Fontaine <tjfontaine@gmail.com>
* build: enable small-icu support for build-releaseJulien Gilli2015-01-261-1/+11
| | | | | | | | | | | | | | | | | On Windows, when building the "build-release" rule, enable both small-icu and download-all. This change also slightly refactors the build-release rule, mainly so that it's easier to read. The resulting MSI package was tested on Windows 7. Fixes #9099. PR: #9100 PR-URL: https://github.com/joyent/node/pull/9100 Reviewed-By: Steven R. Loomis <srloomis@us.ibm.com> Reviewed-By: Timothy J Fontaine <tjfontaine@gmail.com>
* Merge remote-tracking branch 'origin/v0.10' into v0.12Timothy J Fontaine2015-01-26121-5421/+2005
|\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/api/assert.markdown src/node_version.h test/simple/test-crypto-stream.js vcbuild.bat
| * Now working on 0.10.37Timothy J Fontaine2015-01-261-2/+2
| |
| * Merge branch 'v0.10.36-release' into v0.10Timothy J Fontaine2015-01-262-2/+11
| |\
| | * 2015.01.26, Version 0.10.36 (Stable)v0.10.36v0.10.36-releaseTimothy J Fontaine2015-01-262-2/+11
| |/ | | | | | | | | | | | | | | * openssl: update to 1.0.1l * v8: Fix debugger and strict mode regression (Julien Gilli) * v8: don't busy loop in cpu profiler thread (Ben Noordhuis)
| * build: add win32 convenience build ruleTimothy J Fontaine2015-01-231-0/+2
| | | | | | | | | | | | | | PR-URL: https://github.com/joyent/node/pull/9085 PR: #9085 Reviewed-by: Julien Gilli <julien.gilli@joyent.com>
| * test: fix crypto-stream after openssl updateFedor Indutny2015-01-211-1/+1
| | | | | | | | | | | | | | Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Timothy J Fontaine <tjfontaine@gmail.com> Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
| * build: remove vanished masm file from openssl buildFedor Indutny2015-01-211-2/+1
| | | | | | | | | | | | | | Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Timothy J Fontaine <tjfontaine@gmail.com> Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
| * deps: update openssl to 1.0.1lJames M Snell2015-01-2117-81/+34
| | | | | | | | | | | | Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Timothy J Fontaine <tjfontaine@gmail.com> Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
| * deps: update openssl to 1.0.1kFedor Indutny2015-01-21116-5360/+1981
| | | | | | | | | | | | | | Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Timothy J Fontaine <tjfontaine@gmail.com> Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
| * doc: use correct signature for assert()Andrei Sedoi2015-01-201-1/+1
| | | | | | | | | | | | | | | | | | The message argument is optional for both assert() and assert.ok(). This commit makes message optional for assert(). PR-URL: https://github.com/joyent/node/pull/9003 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Trevor Norris <trev.norris@gmail.com>
* | url: fix parsing of ssh urlsEvan Lucas2015-01-232-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix regression introduced in 61204720361824881aefd64f5bccda7d7be6617a that broke parsing of some ssh: urls. An example url is ssh://git@github.com:npm/npm.git Fixes #9072. Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Julien Gilli <julien.gilli@joyent.com> Reviewed-By: Trevor Norris <trev.norris@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
* | net: throw on invalid socket timeoutscjihrig2015-01-224-10/+44
| | | | | | | | | | | | | | | | | | | | | | | | This commit restricts socket timeouts non-negative, finite numbers. Any other value throws a TypeError or RangeError. This prevents subtle bugs that can happen due to type coercion. Fixes: https://github.com/joyent/node/issues/8618 PR-URL: https://github.com/joyent/node/pull/8884 Reviewed-By: Trevor Norris <trev.norris@gmail.com> Reviewed-By: Timothy J Fontaine <tjfontaine@gmail.com>
* | Now working on 0.11.16Julien Gilli2015-01-201-2/+2
| |
* | Merge branch 'v0.11.15-release' into v0.12Julien Gilli2015-01-202-2/+141
|\ \
| * | 2015.01.20, Version 0.11.15 (Unstable)v0.11.15v0.11.15-releaseJulien Gilli2015-01-202-2/+141
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v8: Upgrade to 3.28.73 * uv: Upgrade to 1.0.2 * npm: Upgrade to v2.1.6 * uv: float patch to revert tty breakage (Trevor Norris) * v8: re-implement debugger-agent (Fedor Indutny) * v8: apply floating irhydra patch (Fedor Indutny) * v8: fix postmortem-metadata generator (Refael Ackermann) * debugger: fix unhandled error in setBreakpoint (Miroslav Bajtoš) * async-wrap: add event hooks (Trevor Norris) * async-wrap: expose async-wrap as binding (Trevor Norris) * buffer, doc: misc. fix and cleanup (Trevor Norris) * buffer: add generic functions for (u)int ops (Yazhong Liu) * buffer: fix and cleanup fill() (Trevor Norris) * buffer: mv floating point read/write checks to JS (Trevor Norris) * build, i18n: improve Intl build, add "--with-intl" (Steven R. Loomis) * build: add small-icu support for binary packages (Julien Gilli) * build: do not generate support for libuv's probes (Julien Gilli) * build: i18n: add icu config options (Steven R. Loomis) * build: i18n: support little-endian machines (Steven Loomis) * build: vcbuild fix "The input line is too long." (Alexis Campailla) * child_process: improve spawn() argument handling (cjihrig) * cluster: avoid race enabling debugger in worker (Timothy J Fontaine) * cluster: cluster.disconnect() should check status (Sam Roberts) * cluster: do not signal children in debug mode (Fedor Indutny) * cluster: don't assert if worker has no handles (Sam Roberts) * core: fix usage of uv_cwd (Saúl Ibarra Corretgé) * core: replace uv_fs_readdir with uv_fs_scandir (Saúl Ibarra Corretgé) * crypto: createDiffieHellman throw for bad args (Trevor Norris) * crypto: lower RSS usage for TLSCallbacks (Fedor Indutny) * crypto: store thread id as pointer-sized (Alexis Campailla) * dns: propagate domain for c-ares methods (Chris Dickinson) * fs: fix symlink error message (Vladimir Kurchatkin) * http: Improve _addHeaderLines method (Jackson Tian) * http: cleanup setHeader() (Trevor Norris) * http: rename flush to flushHeaders (Timothy J Fontaine) * lib,src: fix spawnSync ignoring its 'env' option (Juanjo) * modules: adding load linked modules feature (Thorsten Lorenz) * net: Make server.connections un-enumerable (Patrick Mooney) * net: add pauseOnConnect option to createServer() (cjihrig) * net: make connect() input validation synchronous (cjihrig) * node: avoid automatic microtask runs (Vladimir Kurchatkin) * node: fix throws before timer module is loaded (Trevor Norris) * openssl: fix keypress requirement in apps on win32 (Fedor Indutny) * path: added parse() and format() functions (Rory Bradford) * path: allow calling platform specific methods (Timothy J Fontaine) * path: don't lower-cases drive letters (Bert Belder) * path: refactor normalizeArray() (Nathan Woltman) * process: pid can be a string in process.kill() (Sam Roberts) * readline: fix performance issue when large line (Jicheng Li) * readline: should not require an output stream. (Julien Gilli) * smalloc: check if obj has external data (Vladimir Kurchatkin) * smalloc: don't allow to dispose typed arrays (Vladimir Kurchatkin) * smalloc: fix bad assert for zero length data (Trevor Norris) * smalloc: fix copyOnto optimization (Vladimir Kurchatkin) * src: all wrap's now use actual FunctionTemplate (Trevor Norris) * src: fix VC++ warning C4244 (Rasmus Christian Pedersen) * src: remove Async Listener (Trevor Norris) * stream: switch _writableState.buffer to queue (Chris Dickinson) * streams: make setDefaultEncoding() throw (Brian White) * streams: set default encoding for writable streams (Johnny Ray) * tls: remove tls.createSecurePair code deprecation (Jackson Tian) * tls_wrap: ignore ZERO_RETURN after close_notify (Fedor Indutny) * url: change hostname regex to negate invalid chars (Jonathan Johnson) * url: fixed encoding for slash switching emulation. (Evan Rutledge Borden) * url: improve parsing speed (CGavrila) * url: make query() consistent (Gabriel Wicke) * url: support `path` for url.format (Yazhong Liu) * util: add es6 Symbol support for `util.inspect` (gyson)
* | doc: use correct signature for assert()Andrei Sedoi2015-01-201-1/+1
| | | | | | | | | | | | | | | | | | The message argument is optional for both assert() and assert.ok(). This commit makes message optional for assert(). PR-URL: https://github.com/joyent/node/pull/9003 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Trevor Norris <trev.norris@gmail.com>
* | test: fix test-debug-port-from-cmdline.jsJulien Gilli2015-01-161-10/+9
| | | | | | | | | | | | | | | | | | | | | | Make this test less prone to race conditions by using synchronous interprocess communication instead of a timer to determine when the child process is ready to receive messages from its parent. Also, remove a superfluous timer since the tests suite already makes tests time out after a while. Reviewed-By: Timothy J Fontaine <tjfontaine@gmail.com>
* | http: rename flush to flushHeadersTimothy J Fontaine2015-01-163-4/+4
| | | | | | | | | | | | | | | | | | | | | | In order to preserve the potential for a flush method being added to the streams API, rename flush to flushHeaders which is much more clear about the behavior of this method. PR: #9048 PR-URL: https://github.com/joyent/node/pull/9048 Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
* | crypto: don't use transitionary ThrowExceptionTimothy J Fontaine2015-01-161-3/+3
| | | | | | | | | | | | | | | | | | | | Since the current environment is in scope use ThrowError on that, instead of having to lookup the Environment again. Added benefit, lint the source code. Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
* | src: lint remove extra node_crypto includeTimothy J Fontaine2015-01-161-2/+0
| | | | | | | | | | Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
* | test: fix test-fs-access.jsJulien Gilli2015-01-161-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On non-windows supported platforms, fs.access(readOnlyFile, W_OK, ...) is expected to fail, but always succeeds if node runs as the super user, which is often the case for tests running on our continuous integration platform. This change makes the test try to change its process user id to nobody on non-windows platforms so that the above mentioned test can pass and still perform the actual desired test. If changing the process user id to a nobody is not possible, then the test checks that fs.access(readOnlyFile, W_OK, ...) actually succeeds. Fixes #9033. Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Timothy J Fontaine <tjfontaine@gmail.com>
* | src: add license content from ICUSteven R. Loomis2015-01-161-0/+385
| | | | | | | | | | | | | | | | | | Added license info from: http://source.icu-project.org/repos/icu/icu/trunk/license.html All text pasted. Long lines wrapped. (original is HTML.) Reviewed-By: Julien Gilli <julien.gilli@joyent.com> Reviewed-By: Timothy J Fontaine <tjfontaine@gmail.com>
* | test: debug-signal-cluster should not be raceyTimothy J Fontaine2015-01-151-30/+30
| | | | | | | | | | | | | | | | | | | | unref one superfluous timer (as the test suite already has a global timeout), and improve the state machine to iterate the messages more reliably. Ultimately make the test complete more quickly. Signed-off-by: Julien Gilli <julien.gilli@joyent.com>
* | cluster: avoid race enabling debugger in workerTimothy J Fontaine2015-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously if a worker's state machine had already transitioned into the 'listening' state when it received the message enabling the debugger, the worker would never enable its debugger. Change the logic to allow the 'listening' as a valid state for enabling the debugger. Fixes #6440 Signed-off-by: Julien Gilli <julien.gilli@joyent.com>
* | path: don't lower-cases drive lettersBert Belder2015-01-153-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In general path functions don't change the case of a path. Making an exception for windows drive letters violates the principle of least surprise. Changing the drive letter case has caused a lot of issues, including joyent/node#7031, joyent/node#7806 and lots of bikeshedding about whether uppercase is the right case or lowercase. This effectively reverts joyent/node@a05f973 Reviewed-by: Alexis Campailla <alexis@janeasystems.com> Reviewed-by: Julien Gilli <julien.gilli@joyent.com>
* | build: add small-icu support for binary packagesJulien Gilli2015-01-142-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Invokes the configure script used to build binary packages (OSX pkg, binary tarballs, pkgsrc, MSI) with --download=all --with-intl=small-icu. Also makes PACKAGEMAKER customizable, because PackageMaker is not necessarily installed in /Developer on OSX anymore. Tested all binary packages on Windows, OSX, Linux and SmartOS. Fixes #7676. Reviewed-by: Steven R. Loomis <srl@icu-project.org> Reviewed-by: Trevor Norris <trev.norris@gmail.com>
* | test: fix ssl/tls options matrix testJulien Gilli2015-01-141-21/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests suite available in test/external/ssl-options was originally written for security fixes made in the v0.10 branch. In this branch, the client's default ciphers list is compatible with SSLv2. After merging this change from v0.10 to v0.12, this tests suite was broken because commits 5d2aef17ee56fbbf415ca1e3034cdb02cd97117c and f4c8020d1068ffba57458b327c62b61b1f29ec63 make SSL/TLS clients use a default ciphers list that is not compatible with the SSLv2 protocol. This change fixes two issues: 1) The cipher list that was setup for a given test was not passed properly to the client. 2) When either or both of clients/servers were using SSLv2, tests were expected to succeed when at least the server end was using SSLv2 compatible ciphers. Now, tests are expected to succeed only if SSLv2 compatible ciphers are used on both ends. Fixes #9020. Reviewed-by: Trevor Norris <trev.norris@gmail.com>
* | test: fix test-crypto-stream.jsJulien Gilli2015-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent merge of v0.10 to v0.12 (0c7f6ca83091eb5516d07153f35f851e47f753ee) upgraded OpenSSL to version 1.0.1j. In v0.10, this required test-crypto-stream.js to be fixed with commit 707cc25011d142fe4ade14ce2aa083a96ef15bcb. Basically, instead of returning the proper error, Err_get_error() would return 0 and the test for the error message needed to be updated in test-crypto-stream.js. However, in the v0.12 branch, crypto error messages are handled a bit differently since commit 26a1b712ec4e39cedc0b305165ce4660f47ba4d5 landed. Instead of returning the default OpenSSL error message, it makes the decipher stream return a default message specific to Node.js. This commit updates test-crypto-stream.js to test the error object against the proper default error message. Fixes #9019. Reviewed-by: Trevor Norris <trev.norris@gmail.com>
* | cluster: don't assert if worker has no handlesSam Roberts2015-01-143-1/+92
| | | | | | | | | | | | Do not assume that all workers share all shared handles. Signed-off-by: Julien Gilli <julien.gilli@joyent.com>
* | cluster: cluster.disconnect() should check statusSam Roberts2015-01-142-1/+37
| | | | | | | | | | | | | | Workers that are already disconnected but not yet exited should not be disconnected, trying to do so raises exceptions. Signed-off-by: Julien Gilli <julien.gilli@joyent.com>
* | Merge remote-tracking branch 'upstream/v0.10' into v0.12Julien Gilli2015-01-142-57/+0
|\ \ | |/ | | | | | | Conflicts: test/simple/test-child-process-spawn-typeerror.js
| * docs: delete unused/duplicate css filesRobert Kowalski2015-01-142-57/+0
| | | | | | | | | | | | | | | | | | - `sh.css` already exists in `api_assets` - `sh_vim-dark.css` is unused, but used in the repo `node-website` now Reviewed-by: Trevor Norris <trev.norris@gmail.com> Signed-off-by: Julien Gilli <julien.gilli@joyent.com>
| * test: backport use executable in spawn() testcjihrig2015-01-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Backport 10703774f01a4005fc74d6b4131c713259e81657 from the v0.12 branch. Currently, the test-child-process-spawn-typeerror.js is calling execFile() on a JavaScript source file, which is causing failures on Windows. This commit switches to calling spawn() on an actual executable. Fixes #8930. Signed-off-by: Julien Gilli <julien.gilli@joyent.com>
* | Merge remote-tracking branch 'upstream/v0.10' into v0.12Julien Gilli2015-01-134-12/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: deps/v8/src/debug-debugger.js deps/v8/src/mirror-debugger.js deps/v8/src/platform-freebsd.cc deps/v8/src/platform-linux.cc deps/v8/src/platform-macos.cc deps/v8/src/platform-openbsd.cc deps/v8/src/platform-posix.cc deps/v8/src/platform-solaris.cc deps/v8/tools/gyp/v8.gyp
| * deps: revert backport b593aa8 from v8 upstreamJulien Gilli2015-01-132-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 45f1330425b671905a02fe30ee7a1dd9544c2709. 45f1330425b671905a02fe30ee7a1dd9544c2709 was basically breaking node-inspector. V8 landed a patch upstream that would probably fix these issues (see https://codereview.chromium.org/813873007), but without the ability to properly test it in the wild, it's safer to just revert the breaking change. Fixes #8948. Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-by: Trevor Norris <trev.norris@gmail.com>
| * v8: don't busy loop in cpu profiler threadBen Noordhuis2015-01-127-26/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the overhead of the CPU profiler by replacing sched_yield() with nanosleep() in V8's tick event processor thread. The former only yields the CPU when there is another process scheduled on the same CPU. Before this commit, the thread would effectively busy loop and consume 100% CPU time. By forcing a one nanosecond sleep period rounded up to the task scheduler's granularity (about 50 us on Linux), CPU usage for the processor thread now hovers around 10-20% for a busy application. PR-URL: https://github.com/joyent/node/pull/8789 Ref: https://github.com/strongloop/strong-agent/issues/3 Reviewed-by: Trevor Norris <trev.norris@gmail.com>
* | Merge remote-tracking branch 'upstream/v0.12' into merge-0-10-into-0-12Julien Gilli2015-01-125-0/+213
|\ \
| * | fs: add access() and accessSync()Colin Ihrig2015-01-125-0/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | fs.exists() and fs.existsSync() do not follow the typical error first callback convention. access() and accessSync() are added as alternatives in this commit. PR-URL: https://github.com/joyent/node/pull/8714 Reviewed-by: Trevor Norris <trev.norris@gmail.com>
* | | child_process: fix test after latest mergeJulien Gilli2015-01-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | child_process.spawn's argument parsing is stricter in v0.12 than in v0.10. Changes in tests merged from v0.10 that relied on the less-strict argument parsing would fail. This change updates the test so that it makes sure that the stricter argument parsing fails as expected. This change also fixes a small typo introduced during the conflicts resolution of said merge.
* | | openssl: fix keypress requirement in apps on win32Fedor Indutny2015-01-121-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | Original source: http://openssl.6102.n7.nabble.com/PATCH-s-client-Fix-keypress-requirement-with-redirected-input-on-Windows-td46787.html Reviewed-By: Fedor Indutny <fedor@indutny.com>
* | | test: use executable in spawn() testcjihrig2015-01-121-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the test-child-process-spawn-typeerror.js is calling execFile() on a JavaScript source file, which is causing failures on Windows. This commit switches to calling spawn() on an actual executable. Reviewed-by: Sam Roberts <sam@strongloop.com> Reviewed-by: Julien Gilli <julien.gilli@joyent.com>
* | | tests: append instead of override environmentJulien Gilli2015-01-125-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests that rely on some environment variables being passed to child processes would fail because they reset the child processes' environement instead of appending to it. This would break on test environments where some custom environment variables are needed to make node work properly. Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-by: Trevor Norris <trev.norris@gmail.com>
* | | src: fix indentation in _tls_wrap.jsJulien Gilli2015-01-121-2/+2
| | | | | | | | | | | | | | | Fix indentation issue in code added during the latest merge. This change makes jslint pass for _tls_wrap.js.
* | | deps: remove duplicate uv__loop_configureJulien Gilli2015-01-121-5/+0
| | | | | | | | | | | | | | | | | | The latest merge resulted in uv__loop_configure being defined twice on Windows. This changes removes one of these duplicates to fix the build on this platform.