Skip to content

Commit

Permalink
deps: update libuv to v0.11.26
Browse files Browse the repository at this point in the history
  • Loading branch information
indutny committed Jun 27, 2014
1 parent 35b9580 commit 1a1b1a7
Show file tree
Hide file tree
Showing 62 changed files with 955 additions and 194 deletions.
1 change: 1 addition & 0 deletions deps/uv/.mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Keno Fischer <kenof@stanford.edu> <kfischer@college.harvard.edu>
Maciej Małecki <maciej.malecki@notimplemented.org> <me@mmalecki.com>
Marc Schlaich <marc.schlaich@googlemail.com> <marc.schlaich@gmail.com>
Rasmus Christian Pedersen <ruysch@outlook.com>
Rasmus Christian Pedersen <zerhacken@yahoo.com> <ruysch@outlook.com>
Rasmus Pedersen <ruysch@outlook.com> <zerhacken@yahoo.com>
Robert Mustacchi <rm@joyent.com> <rm@fingolfin.org>
Ryan Dahl <ryan@joyent.com> <ry@tinyclouds.org>
Expand Down
7 changes: 7 additions & 0 deletions deps/uv/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,10 @@ Norio Kobota <nori.0428@gmail.com>
李港平 <chopdown@gmail.com>
Chernyshev Viacheslav <astellar@ro.ru>
Stephen von Takach <steve@advancedcontrol.com.au>
JD Ballard <jd@pixelandline.com>
Luka Perkov <luka.perkov@sartura.hr>
Ryan Cole <ryan@rycole.com>
HungMingWu <u9089000@gmail.com>
Jay Satiro <raysatiro@yahoo.com>
Leith Bade <leith@leithalweapon.geek.nz>
Peter Atashian <retep998@gmail.com>
15 changes: 2 additions & 13 deletions deps/uv/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,8 @@ Bug fixes and features should come with tests. Add your tests in the
Look at other tests to see how they should be structured (license boilerplate,
the way entry points are declared, etc.).

```
$ make test
```

Make sure that there are no test regressions.
Check README.md file to find out how to run the test suite and make sure that
there are no test regressions.

### PUSH

Expand All @@ -163,15 +160,7 @@ feature branch. Post a comment in the pull request afterwards; GitHub does
not send out notifications when you add commits.


### CONTRIBUTOR LICENSE AGREEMENT

The current state of affairs is that, in order to get a patch accepted, you need
to sign Node.js's [contributor license agreement][]. You only need to do that
once.


[issue tracker]: https://github.com/joyent/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
[contributor license agreement]: http://nodejs.org/cla.html
88 changes: 66 additions & 22 deletions deps/uv/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,41 @@
2014.05.02, Version 0.11.25 (Unstable)
2014.06.28, Version 0.11.26 (Unstable)

Changes since version 0.11.25:

* windows: add VT100 codes ?25l and ?25h (JD Ballard)

* windows: add invert ANSI (7 / 27) emulation (JD Ballard)

* unix: fix handling error on UDP socket creation (Saúl Ibarra Corretgé)

* unix, windows: getnameinfo implementation (Rasmus Pedersen)

* heap: fix `heap_remove()` (Fedor Indutny)

* unix, windows: fix parsing scoped IPv6 addresses (Saúl Ibarra Corretgé)

* windows: fix handling closed socket while poll handle is closing (Saúl Ibarra
Corretgé)

* thread: barrier functions (Ben Noordhuis)

* windows: fix PYTHON environment variable usage (Jay Satiro)

* unix, windows: return system error on EAI_SYSTEM (Saúl Ibarra Corretgé)

* windows: fix handling closed socket while poll handle is closing (Saúl Ibarra
Corretgé)

* unix: don't run i/o callbacks after prepare callbacks (Saúl Ibarra Corretgé)

* windows: add tty unicode support for input (Peter Atashian)

* header: introduce `uv_loop_size()` (Andrius Bentkus)

* darwin: invoke `mach_timebase_info` only once (Fedor Indutny)


2014.05.02, Version 0.11.25 (Unstable), 2acd544cff7142e06aa3b09ec64b4a33dd9ab996

Changes since version 0.11.24:

Expand Down Expand Up @@ -33,8 +70,6 @@ Changes since version 0.11.23:

* inet: allow scopeid in uv_inet_pton (Fedor Indutny)

* win: always leave crit section in get_proc_title (Fedor Indutny)


2014.04.07, Version 0.11.23 (Unstable), e54de537efcacd593f36fcaaf8b4cb9e64313275

Expand Down Expand Up @@ -77,25 +112,6 @@ Changes since version 0.11.22:
* unix: fix setting written size on uv_wd (Saúl Ibarra Corretgé)


2014.04.07, Version 0.10.26 (Stable), d864907611c25ec986c5e77d4d6d6dee88f26926

Changes since version 0.10.25:

* process: don't close stdio fds during spawn (Tonis Tiigi)

* build, windows: do not fail on Windows SDK Prompt (Marc Schlaich)

* build, windows: fix x64 configuration issue (Marc Schlaich)

* win: fix buffer leak on error in pipe.c (Fedor Indutny)

* kqueue: invalidate fd in uv_fs_event_t (Fedor Indutny)

* linux: always deregister closing fds from epoll (Geoffry Song)

* error: add ENXIO for O_NONBLOCK FIFO open() (Fedor Indutny)


2014.03.11, Version 0.11.22 (Unstable), cd0c19b1d3c56acf0ade7687006e12e75fbda36d

Changes since version 0.11.21:
Expand Down Expand Up @@ -225,6 +241,34 @@ Changes since version 0.11.18:
* linux: fix C99/C++ comment (Fedor Indutny)


2014.05.02, Version 0.10.27 (Stable), 6e24ce23b1e7576059f85a608eca13b766458a01

Changes since version 0.10.26:

* windows: fix console signal handler refcount (Saúl Ibarra Corretgé)

* win: always leave crit section in get_proc_title (Fedor Indutny)


2014.04.07, Version 0.10.26 (Stable), d864907611c25ec986c5e77d4d6d6dee88f26926

Changes since version 0.10.25:

* process: don't close stdio fds during spawn (Tonis Tiigi)

* build, windows: do not fail on Windows SDK Prompt (Marc Schlaich)

* build, windows: fix x64 configuration issue (Marc Schlaich)

* win: fix buffer leak on error in pipe.c (Fedor Indutny)

* kqueue: invalidate fd in uv_fs_event_t (Fedor Indutny)

* linux: always deregister closing fds from epoll (Geoffry Song)

* error: add ENXIO for O_NONBLOCK FIFO open() (Fedor Indutny)


2014.02.19, Version 0.10.25 (Stable), d778dc588507588b12b9f9d2905078db542ed751

Changes since version 0.10.24:
Expand Down
10 changes: 8 additions & 2 deletions deps/uv/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ libuv_la_SOURCES += src/win/async.c \
src/win/fs-event.c \
src/win/fs.c \
src/win/getaddrinfo.c \
src/win/getnameinfo.c \
src/win/handle.c \
src/win/handle-inl.h \
src/win/internal.h \
Expand Down Expand Up @@ -86,6 +87,7 @@ libuv_la_SOURCES += src/unix/async.c \
src/unix/dl.c \
src/unix/fs.c \
src/unix/getaddrinfo.c \
src/unix/getnameinfo.c \
src/unix/internal.h \
src/unix/loop-watcher.c \
src/unix/loop.c \
Expand Down Expand Up @@ -138,6 +140,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
test/test-get-loadavg.c \
test/test-get-memory.c \
test/test-getaddrinfo.c \
test/test-getnameinfo.c \
test/test-getsockname.c \
test/test-hrtime.c \
test/test-idle.c \
Expand All @@ -163,6 +166,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
test/test-pipe-server-close.c \
test/test-platform-output.c \
test/test-poll-close.c \
test/test-poll-closesocket.c \
test/test-poll.c \
test/test-process-title.c \
test/test-ref.c \
Expand Down Expand Up @@ -238,8 +242,10 @@ libuv_la_SOURCES += src/unix/aix.c
endif

if ANDROID
include_HEADERS += include/android-ifaddrs.h
libuv_la_SOURCES += src/unix/android-ifaddrs.c
include_HEADERS += include/android-ifaddrs.h \
include/pthread-fixes.h
libuv_la_SOURCES += src/unix/android-ifaddrs.c \
src/unix/pthread-fixes.c
endif

if DARWIN
Expand Down
1 change: 1 addition & 0 deletions deps/uv/Makefile.mingw
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ OBJS = src/fs-poll.o \
src/win/fs-event.o \
src/win/fs.o \
src/win/getaddrinfo.o \
src/win/getnameinfo.o \
src/win/handle.o \
src/win/loop-watcher.o \
src/win/pipe.o \
Expand Down
8 changes: 4 additions & 4 deletions deps/uv/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,9 @@ To build with autotools:

### Windows

First, Python 2.6 or 2.7 must be installed as it is required by [GYP][].

Also, the directory for the preferred Python executable must be specified
by the `PYTHON` or `Path` environment variables.
First, [Python][] 2.6 or 2.7 must be installed as it is required by [GYP][].
If python is not in your path set the environment variable `PYTHON` to its
location. For example: `set PYTHON=C:\Python27\python.exe`

To build with Visual Studio, launch a git shell (e.g. Cmd or PowerShell)
and run vcbuild.bat which will checkout the GYP code into build/gyp and
Expand Down Expand Up @@ -139,5 +138,6 @@ See the [guidelines for contributing][].

[node.js]: http://nodejs.org/
[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
2 changes: 1 addition & 1 deletion deps/uv/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

AC_PREREQ(2.57)
AC_INIT([libuv], [0.11.25], [https://github.com/joyent/libuv/issues])
AC_INIT([libuv], [0.11.26], [https://github.com/joyent/libuv/issues])
AC_CONFIG_MACRO_DIR([m4])
m4_include([m4/libuv-extra-automake-flags.m4])
m4_include([m4/as_case.m4])
Expand Down
2 changes: 0 additions & 2 deletions deps/uv/include/uv-bsd.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,4 @@

#define UV_HAVE_KQUEUE 1

#define UV_PLATFORM_HAS_IP6_LINK_LOCAL_ADDRESS

#endif /* UV_BSD_H */
2 changes: 0 additions & 2 deletions deps/uv/include/uv-darwin.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,4 @@

#define UV_HAVE_KQUEUE 1

#define UV_PLATFORM_HAS_IP6_LINK_LOCAL_ADDRESS

#endif /* UV_DARWIN_H */
1 change: 0 additions & 1 deletion deps/uv/include/uv-errno.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
#define UV__EAI_OVERFLOW (-3009)
#define UV__EAI_SERVICE (-3010)
#define UV__EAI_SOCKTYPE (-3011)
#define UV__EAI_SYSTEM (-3012) /* TODO(bnoordhuis) Return system error. */
#define UV__EAI_BADHINTS (-3013)
#define UV__EAI_PROTOCOL (-3014)

Expand Down
2 changes: 0 additions & 2 deletions deps/uv/include/uv-linux.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,4 @@
void* watchers[2]; \
int wd; \

#define UV_PLATFORM_HAS_IP6_LINK_LOCAL_ADDRESS

#endif /* UV_LINUX_H */
2 changes: 0 additions & 2 deletions deps/uv/include/uv-sunos.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,4 @@

#endif /* defined(PORT_SOURCE_FILE) */

#define UV_PLATFORM_HAS_IP6_LINK_LOCAL_ADDRESS

#endif /* UV_SUNOS_H */
17 changes: 17 additions & 0 deletions deps/uv/include/uv-unix.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@
# include "uv-bsd.h"
#endif

#ifndef NI_MAXHOST
# define NI_MAXHOST 1025
#endif

#ifndef NI_MAXSERV
# define NI_MAXSERV 32
#endif

#ifndef UV_IO_PRIVATE_PLATFORM_FIELDS
# define UV_IO_PRIVATE_PLATFORM_FIELDS /* empty */
#endif
Expand Down Expand Up @@ -281,6 +289,15 @@ typedef struct {
struct addrinfo* res; \
int retcode;

#define UV_GETNAMEINFO_PRIVATE_FIELDS \
struct uv__work work_req; \
uv_getnameinfo_cb getnameinfo_cb; \
struct sockaddr_storage storage; \
int flags; \
char host[NI_MAXHOST]; \
char service[NI_MAXSERV]; \
int retcode;

#define UV_PROCESS_PRIVATE_FIELDS \
void* queue[2]; \
int status; \
Expand Down
2 changes: 1 addition & 1 deletion deps/uv/include/uv-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#define UV_VERSION_MAJOR 0
#define UV_VERSION_MINOR 11
#define UV_VERSION_PATCH 25
#define UV_VERSION_PATCH 26
#define UV_VERSION_IS_RELEASE 1

#endif /* UV_VERSION_H */
9 changes: 8 additions & 1 deletion deps/uv/include/uv-win.h
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,14 @@ RB_HEAD(uv_timer_tree_s, uv_timer_s);
struct addrinfoW* res; \
int retcode;

#define UV_GETNAMEINFO_PRIVATE_FIELDS \
uv_getnameinfo_cb getnameinfo_cb; \
struct sockaddr_storage storage; \
int flags; \
char host[NI_MAXHOST]; \
char service[NI_MAXSERV]; \
int retcode;

#define UV_PROCESS_PRIVATE_FIELDS \
struct uv_process_exit_s { \
UV_REQ_FIELDS \
Expand Down Expand Up @@ -587,4 +595,3 @@ int uv_utf16_to_utf8(const WCHAR* utf16Buffer, size_t utf16Size,
int uv_utf8_to_utf16(const char* utf8Buffer, WCHAR* utf16Buffer,
size_t utf16Size);

#define UV_PLATFORM_HAS_IP6_LINK_LOCAL_ADDRESS
Loading

0 comments on commit 1a1b1a7

Please sign in to comment.