summaryrefslogtreecommitdiff
path: root/deps/uv
diff options
context:
space:
mode:
authorSaúl Ibarra Corretgé <saghul@gmail.com>2014-11-26 22:37:41 +0100
committerTrevor Norris <trev.norris@gmail.com>2014-11-26 15:56:48 -0800
commit69904c8a7838ce4ef4023bb4b980bf87531d74ad (patch)
treebb127f6206470a46f66e7905d2d131141e49e276 /deps/uv
parentbf3e0f417bbf4ba749730a76dd36a3e59d44da3e (diff)
downloadandroid-node-v8-69904c8a7838ce4ef4023bb4b980bf87531d74ad.tar.gz
android-node-v8-69904c8a7838ce4ef4023bb4b980bf87531d74ad.tar.bz2
android-node-v8-69904c8a7838ce4ef4023bb4b980bf87531d74ad.zip
deps: update libuv to 1.0.1
PR-URL: https://github.com/joyent/node/pull/8785 Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Diffstat (limited to 'deps/uv')
-rw-r--r--deps/uv/AUTHORS2
-rw-r--r--deps/uv/CONTRIBUTING.md6
-rw-r--r--deps/uv/ChangeLog17
-rw-r--r--deps/uv/README.md8
-rw-r--r--deps/uv/configure.ac2
-rw-r--r--deps/uv/docs/src/handle.rst2
-rw-r--r--deps/uv/docs/src/index.rst6
-rw-r--r--deps/uv/docs/src/request.rst2
-rw-r--r--deps/uv/include/uv-version.h2
-rw-r--r--deps/uv/include/uv.h2
-rw-r--r--deps/uv/src/unix/process.c9
-rw-r--r--deps/uv/src/win/fs.c10
12 files changed, 45 insertions, 23 deletions
diff --git a/deps/uv/AUTHORS b/deps/uv/AUTHORS
index 7a85150db0..72fa470dab 100644
--- a/deps/uv/AUTHORS
+++ b/deps/uv/AUTHORS
@@ -171,3 +171,5 @@ Mikhail Mukovnikov <yndi@me.com>
Thorsten Lorenz <thlorenz@gmx.de>
Yuri D'Elia <yuri.delia@eurac.edu>
Manos Nikolaidis <manos@shadowrobot.com>
+Elijah Andrews <elijah@busbud.com>
+Michael Ira Krufky <m.krufky@samsung.com>
diff --git a/deps/uv/CONTRIBUTING.md b/deps/uv/CONTRIBUTING.md
index ea4be395ed..332ed1129b 100644
--- a/deps/uv/CONTRIBUTING.md
+++ b/deps/uv/CONTRIBUTING.md
@@ -6,13 +6,13 @@ through the process.
### FORK
-Fork the project [on GitHub](https://github.com/joyent/libuv) and check out
+Fork the project [on GitHub](https://github.com/libuv/libuv) and check out
your copy.
```
$ git clone https://github.com/username/libuv.git
$ cd libuv
-$ git remote add upstream https://github.com/joyent/libuv.git
+$ git remote add upstream https://github.com/libuv/libuv.git
```
Now decide if you want your feature or bug fix to go into the master branch
@@ -160,7 +160,7 @@ feature branch. Post a comment in the pull request afterwards; GitHub does
not send out notifications when you add commits.
-[issue tracker]: https://github.com/joyent/libuv/issues
+[issue tracker]: https://github.com/libuv/libuv/issues
[libuv mailing list]: http://groups.google.com/group/libuv
[IRC]: http://webchat.freelibuv.net/?channels=libuv
[Google C/C++ style guide]: http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml
diff --git a/deps/uv/ChangeLog b/deps/uv/ChangeLog
index a76c4b5bb2..78600b78ed 100644
--- a/deps/uv/ChangeLog
+++ b/deps/uv/ChangeLog
@@ -1,4 +1,19 @@
-2014.11.21, Version 1.0.0 (Stable)
+2014.11.27, Version 1.0.1 (Stable), 0a8e81374e861d425b56c45c8599595d848911d2
+
+Changes since version 1.0.0:
+
+* readme: remove Rust from users (Elijah Andrews)
+
+* doc,build,include: update project links (Ben Noordhuis)
+
+* doc: fix typo: Strcutures -> Structures (Michael Ira Krufky)
+
+* unix: fix processing process handles queue (Saúl Ibarra Corretgé)
+
+* win: replace non-ansi characters in source file (Bert Belder)
+
+
+2014.11.21, Version 1.0.0 (Stable), feb2a9e6947d892f449b2770c4090f7d8c88381b
Changes since version 1.0.0-rc2:
diff --git a/deps/uv/README.md b/deps/uv/README.md
index 1b079d9f34..7fc7cfbd06 100644
--- a/deps/uv/README.md
+++ b/deps/uv/README.md
@@ -5,7 +5,7 @@
libuv is a multi-platform support library with a focus on asynchronous I/O. It
was primarily developed for use by [Node.js](http://nodejs.org), but it's also
used by [Luvit](http://luvit.io/), [Julia](http://julialang.org/),
-[pyuv](https://github.com/saghul/pyuv), and [others](https://github.com/joyent/libuv/wiki/Projects-that-use-libuv).
+[pyuv](https://github.com/saghul/pyuv), and [others](https://github.com/libuv/libuv/wiki/Projects-that-use-libuv).
## Feature highlights
@@ -77,7 +77,7 @@ Documentation can be browsed online [here](http://docs.libuv.org).
&mdash; An overview of libuv with tutorials.
* [LXJS 2012 talk](http://www.youtube.com/watch?v=nGn60vDSxQ4)
&mdash; High-level introductory talk about libuv.
- * [Tests and benchmarks](https://github.com/joyent/libuv/tree/master/test)
+ * [Tests and benchmarks](https://github.com/libuv/libuv/tree/master/test)
&mdash; API specification and usage examples.
* [libuv-dox](https://github.com/thlorenz/libuv-dox)
&mdash; Documenting types and methods of libuv, mostly by reading uv.h.
@@ -181,5 +181,5 @@ See the [guidelines for contributing][].
[GYP]: http://code.google.com/p/gyp/
[Python]: https://www.python.org/downloads/
[Visual Studio Express 2010]: http://www.microsoft.com/visualstudio/eng/products/visual-studio-2010-express
-[guidelines for contributing]: https://github.com/joyent/libuv/blob/master/CONTRIBUTING.md
-[libuv_banner]: https://raw.githubusercontent.com/joyent/libuv/master/img/banner.png
+[guidelines for contributing]: https://github.com/libuv/libuv/blob/master/CONTRIBUTING.md
+[libuv_banner]: https://raw.githubusercontent.com/libuv/libuv/master/img/banner.png
diff --git a/deps/uv/configure.ac b/deps/uv/configure.ac
index 3ab69199d8..247e42bd27 100644
--- a/deps/uv/configure.ac
+++ b/deps/uv/configure.ac
@@ -13,7 +13,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_PREREQ(2.57)
-AC_INIT([libuv], [1.0.0], [https://github.com/joyent/libuv/issues])
+AC_INIT([libuv], [1.0.1], [https://github.com/libuv/libuv/issues])
AC_CONFIG_MACRO_DIR([m4])
m4_include([m4/libuv-extra-automake-flags.m4])
m4_include([m4/as_case.m4])
diff --git a/deps/uv/docs/src/handle.rst b/deps/uv/docs/src/handle.rst
index 4dcfc3dd90..6ba597a21a 100644
--- a/deps/uv/docs/src/handle.rst
+++ b/deps/uv/docs/src/handle.rst
@@ -6,7 +6,7 @@
`uv_handle_t` is the base type for all libuv handle types.
-Strcutures are aligned so that any libuv handle can be cast to `uv_handle_t`.
+Structures are aligned so that any libuv handle can be cast to `uv_handle_t`.
All API functions defined here work with any handle type.
diff --git a/deps/uv/docs/src/index.rst b/deps/uv/docs/src/index.rst
index a8f00dab38..9cdc494aec 100644
--- a/deps/uv/docs/src/index.rst
+++ b/deps/uv/docs/src/index.rst
@@ -11,13 +11,13 @@ was primarily developed for use by `Node.js`_, but it's also used by `Luvit`_,
.. note::
In case you find errors in this documentation you can help by sending
- `pull requests <https://github.com/joyent/libuv>`_!
+ `pull requests <https://github.com/libuv/libuv>`_!
.. _Node.js: http://nodejs.org
.. _Luvit: http://luvit.io
.. _Julia: http://julialang.org
.. _pyuv: https://github.com/saghul/pyuv
-.. _others: https://github.com/joyent/libuv/wiki/Projects-that-use-libuv
+.. _others: https://github.com/libuv/libuv/wiki/Projects-that-use-libuv
Features
@@ -46,7 +46,7 @@ libuv can be downloaded from `here <http://dist.libuv.org/dist/>`_.
Installation
------------
-Installation instructions can be found on `the README <https://github.com/joyent/libuv/blob/master/README.md>`_.
+Installation instructions can be found on `the README <https://github.com/libuv/libuv/blob/master/README.md>`_.
Upgrading
diff --git a/deps/uv/docs/src/request.rst b/deps/uv/docs/src/request.rst
index 29c1277924..2f58d46b14 100644
--- a/deps/uv/docs/src/request.rst
+++ b/deps/uv/docs/src/request.rst
@@ -6,7 +6,7 @@
`uv_req_t` is the base type for all libuv request types.
-Strcutures are aligned so that any libuv request can be cast to `uv_req_t`.
+Structures are aligned so that any libuv request can be cast to `uv_req_t`.
All API functions defined here work with any request type.
diff --git a/deps/uv/include/uv-version.h b/deps/uv/include/uv-version.h
index 4f4220cf62..889abffca3 100644
--- a/deps/uv/include/uv-version.h
+++ b/deps/uv/include/uv-version.h
@@ -32,7 +32,7 @@
#define UV_VERSION_MAJOR 1
#define UV_VERSION_MINOR 0
-#define UV_VERSION_PATCH 0
+#define UV_VERSION_PATCH 1
#define UV_VERSION_IS_RELEASE 1
#define UV_VERSION_SUFFIX ""
diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h
index d17f977b44..7f4fa6dd8a 100644
--- a/deps/uv/include/uv.h
+++ b/deps/uv/include/uv.h
@@ -19,7 +19,7 @@
* IN THE SOFTWARE.
*/
-/* See https://github.com/joyent/libuv#documentation for documentation. */
+/* See https://github.com/libuv/libuv#documentation for documentation. */
#ifndef UV_H
#define UV_H
diff --git a/deps/uv/src/unix/process.c b/deps/uv/src/unix/process.c
index 0aff5fd31f..be283b480d 100644
--- a/deps/uv/src/unix/process.c
+++ b/deps/uv/src/unix/process.c
@@ -85,9 +85,14 @@ static void uv__chld(uv_signal_t* handle, int signum) {
QUEUE_INSERT_TAIL(&pending, &process->queue);
}
- QUEUE_FOREACH(q, &pending) {
+ h = &pending;
+ q = QUEUE_HEAD(h);
+ while (q != h) {
process = QUEUE_DATA(q, uv_process_t, queue);
- QUEUE_REMOVE(q);
+ q = QUEUE_NEXT(q);
+
+ QUEUE_REMOVE(&process->queue);
+ QUEUE_INIT(&process->queue);
uv__handle_stop(process);
if (process->exit_cb == NULL)
diff --git a/deps/uv/src/win/fs.c b/deps/uv/src/win/fs.c
index 13af7c41a3..7208a65c42 100644
--- a/deps/uv/src/win/fs.c
+++ b/deps/uv/src/win/fs.c
@@ -283,7 +283,7 @@ INLINE static int fs__readlink_handle(HANDLE handle, char** target_ptr,
(w_target[4] >= L'a' && w_target[4] <= L'z')) &&
w_target[5] == L':' &&
(w_target_len == 6 || w_target[6] == L'\\')) {
- /* \??\«drive»:\ */
+ /* \??\<drive>:\ */
w_target += 4;
w_target_len -= 4;
@@ -292,8 +292,8 @@ INLINE static int fs__readlink_handle(HANDLE handle, char** target_ptr,
(w_target[5] == L'N' || w_target[5] == L'n') &&
(w_target[6] == L'C' || w_target[6] == L'c') &&
w_target[7] == L'\\') {
- /* \??\UNC\«server»\«share»\ - make sure the final path looks like */
- /* \\«server»\«share»\ */
+ /* \??\UNC\<server>\<share>\ - make sure the final path looks like */
+ /* \\<server>\<share>\ */
w_target += 6;
w_target[0] = L'\\';
w_target_len -= 6;
@@ -308,8 +308,8 @@ INLINE static int fs__readlink_handle(HANDLE handle, char** target_ptr,
w_target_len = reparse_data->MountPointReparseBuffer.SubstituteNameLength /
sizeof(WCHAR);
- /* Only treat junctions that look like \??\«drive»:\ as symlink. */
- /* Junctions can also be used as mount points, like \??\Volume{«guid»}, */
+ /* Only treat junctions that look like \??\<drive>:\ as symlink. */
+ /* Junctions can also be used as mount points, like \??\Volume{<guid>}, */
/* but that's confusing for programs since they wouldn't be able to */
/* actually understand such a path when returned by uv_readlink(). */
/* UNC paths are never valid for junctions so we don't care about them. */