Merge 0ef2ba8 into 05e0e37

deps/README.rst

@@ -71,6 +71,8 @@ Updating libuv
     rm -rf libuv
     mv libuv-$LIBUV_VER libuv
     rm -rf libuv/.github
+    rm -rf libuv/.readthedocs.yaml
+    rm -rf libuv/LINKS.md
     rm -rf libuv/docs
     rm -rf libuv/samples
     rm -rf libuv/test/*.[ch] libuv/test/test.gyp # must leave the fixtures/ dir

deps/libuv-1.42-py27-win.patch

@@ -0,0 +1,27 @@
+diff --git a/deps/libuv/src/win/util.c b/deps/libuv/src/win/util.c
+index 88602c7e..d6009ce3 100644
+--- a/deps/libuv/src/win/util.c
++++ b/deps/libuv/src/win/util.c
+@@ -1662,7 +1662,13 @@ int uv_os_unsetenv(const char* name) {
+   return 0;
+ }
+
+-
++/**
++ * gevent: disable this function for Python 2.7 on Windows.
++ *
++ * It fails to link on anything older than Windows 8/Windows Server 2012
++ * because of GetHostNameW.
++ */
++#if 0
+ int uv_os_gethostname(char* buffer, size_t* size) {
+   WCHAR buf[UV_MAXHOSTNAMESIZE];
+   size_t len;
+@@ -1694,6 +1700,7 @@ int uv_os_gethostname(char* buffer, size_t* size) {
+   *size = len;
+   return 0;
+ }
++#endif
+
+
+ static int uv__get_handle(uv_pid_t pid, int access, HANDLE* handle) {

deps/libuv/.mailmap

@@ -2,6 +2,7 @@ A. Hauptmann <andreashauptmann@t-online.de>
 Aaron Bieber <qbit@deftly.net> <deftly@gmail.com>
 Alan Gutierrez <alan@prettyrobots.com> <alan@blogometer.com>
 Andrius Bentkus <andrius.bentkus@gmail.com> <toxedvirus@gmail.com>
+Andy Fiddaman <andy@omniosce.org> <omnios@citrus-it.co.uk>
 Bert Belder <bertbelder@gmail.com> <i@bertbelder.com>
 Bert Belder <bertbelder@gmail.com> <info@2bs.nl>
 Bert Belder <bertbelder@gmail.com> <user@ChrUbuntu.(none)>
@@ -10,6 +11,8 @@ Brian White <mscdex@mscdex.net>
 Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
 Caleb James DeLisle <cjd@hyperboria.ca> <cjd@cjdns.fr>
 Christoph Iserlohn <christoph.iserlohn@innoq.com>
+Darshan Sen <raisinten@gmail.com>
+David Carlier <devnexen@gmail.com>
 Devchandra Meetei Leishangthem <dlmeetei@gmail.com>
 Fedor Indutny <fedor.indutny@gmail.com> <fedor@indutny.com>
 Frank Denis <github@pureftpd.org>
@@ -32,6 +35,7 @@ Nicholas Vavilov <vvnicholas@gmail.com>
 Nick Logan <ugexe@cpan.org> <nlogan@gmail.com>
 Rasmus Christian Pedersen <zerhacken@yahoo.com>
 Rasmus Christian Pedersen <zerhacken@yahoo.com> <ruysch@outlook.com>
+Richard Lau <rlau@redhat.com> <riclau@uk.ibm.com>
 Robert Mustacchi <rm@joyent.com> <rm@fingolfin.org>
 Ryan Dahl <ryan@joyent.com> <ry@tinyclouds.org>
 Ryan Emery <seebees@gmail.com>
@@ -47,8 +51,10 @@ Timothy J. Fontaine <tjfontaine@gmail.com>
 Yasuhiro Matsumoto <mattn.jp@gmail.com>
 Yazhong Liu <yorkiefixer@gmail.com>
 Yuki Okumura <mjt@cltn.org>
+cjihrig <cjihrig@gmail.com>
 gengjiawen <technicalcute@gmail.com>
 jBarz <jBarz@users.noreply.github.com> <jbarboza@ca.ibm.com>
 jBarz <jBarz@users.noreply.github.com> <jbarz@users.noreply.github.com>
 ptlomholt <pt@lomholt.com>
+tjarlama <59913901+tjarlama@users.noreply.github.com> <tjarlama@gmail.com>
 zlargon <zlargon1988@gmail.com>

deps/libuv/AUTHORS

@@ -114,7 +114,6 @@ Dylan Cali <calid1984@gmail.com>
 Austin Foxley <austinf@cetoncorp.com>
 Benjamin Saunders <ben.e.saunders@gmail.com>
 Geoffry Song <goffrie@gmail.com>
-Rasmus Christian Pedersen <ruysch@outlook.com>
 William Light <wrl@illest.net>
 Oleg Efimov <o.efimov@corp.badoo.com>
 Lars Gierth <larsg@systemli.org>
@@ -123,7 +122,6 @@ Justin Venus <justin.venus@gmail.com>
 Kristian Evensen <kristian.evensen@gmail.com>
 Linus Mårtensson <linus.martensson@sonymobile.com>
 Navaneeth Kedaram Nambiathan <navaneethkn@gmail.com>
-Yorkie <yorkiefixer@gmail.com>
 StarWing <weasley.wx@gmail.com>
 thierry-FreeBSD <thierry@FreeBSD.org>
 Isaiah Norton <isaiah.norton@gmail.com>
@@ -212,7 +210,7 @@ guworks <ground.up.works@gmail.com>
 RossBencina <rossb@audiomulch.com>
 Roger A. Light <roger@atchoo.org>
 chenttuuvv <chenttuuvv@yahoo.com>
-Richard Lau <riclau@uk.ibm.com>
+Richard Lau <rlau@redhat.com>
 ronkorving <rkorving@wizcorp.jp>
 Corbin Simpson <MostAwesomeDude@gmail.com>
 Zachary Hamm <zsh@imipolexg.org>
@@ -448,3 +446,36 @@ Aleksej Lebedev <root@zta.lk>
 Nikolay Mitev <github@hmel.org>
 Ulrik Strid <ulrik.strid@outlook.com>
 Elad Lahav <elahav@qnx.com>
+Elad Nachmias <eladn@pazam.net>
+Darshan Sen <raisinten@gmail.com>
+Simon Kadisch <simon.kadisch@k13-engineering.at>
+Momtchil Momtchev <momtchil@momtchev.com>
+Ethel Weston <66453757+ethelweston@users.noreply.github.com>
+Drew DeVault <sir@cmpwn.com>
+Mark Klein <klein@cscs.ch>
+schamberg97 <50446906+schamberg97@users.noreply.github.com>
+Bob Weinand <bobwei9@hotmail.com>
+Issam E. Maghni <issam.e.maghni@mailbox.org>
+Juan Pablo Canepa <jpcanepa@gmail.com>
+Shuowang (Wayne) Zhang <shuowang.zhang@ibm.com>
+Ondřej Surý <ondrej@sury.org>
+Juan José Arboleda <soyjuanarbol@gmail.com>
+Zhao Zhili <zhilizhao@tencent.com>
+Brandon Cheng <brandon.cheng@protonmail.com>
+Matvii Hodovaniuk <matvii@hodovani.uk>
+Hayden <me@diatr.us>
+yiyuaner <yguoaz@gmail.com>
+bbara <bbara93@gmail.com>
+SeverinLeonhardt <Severin.Leonhardt@teamviewer.com>
+Andy Fiddaman <andy@omniosce.org>
+Romain Roffé <rofferom@gmail.com>
+Eagle Liang <eagleliang@gmail.com>
+Ricky Zhou <ives199511@gmail.com>
+Simon Kissane <skissane@gmail.com>
+James M Snell <jasnell@gmail.com>
+Ali Mohammad Pur <Ali.mpfard@gmail.com>
+Erkhes N <71805796+rexes-ND@users.noreply.github.com>
+Joshua M. Clulow <josh@sysmgr.org>
+Guilherme Íscaro <cabelitostos@gmail.com>
+Martin Storsjö <martin@martin.st>
+Claes Nästén <pekdon@gmail.com>

deps/libuv/CMakeLists.txt

@@ -30,6 +30,14 @@ if(QEMU)
   add_definitions(-D__QEMU__=1)
 endif()
 
+option(ASAN "Enable AddressSanitizer (ASan)" OFF)
+if(ASAN AND CMAKE_C_COMPILER_ID MATCHES "AppleClang|GNU|Clang")
+  add_definitions(-D__ASAN__=1)
+  set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
+  set (CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
+  set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fno-omit-frame-pointer -fsanitize=address")
+endif()
+
 # Compiler check
 string(CONCAT is-msvc $<OR:
   $<C_COMPILER_ID:MSVC>,
@@ -95,6 +103,9 @@ list(APPEND uv_cflags ${lint-no-conditional-assignment-msvc})
 list(APPEND uv_cflags ${lint-no-unsafe-msvc})
 list(APPEND uv_cflags ${lint-utf8-msvc} )
 
+check_c_compiler_flag(-fno-strict-aliasing UV_F_STRICT_ALIASING)
+list(APPEND uv_cflags $<$<BOOL:${UV_F_STRICT_ALIASING}>:-fno-strict-aliasing>)
+
 set(uv_sources
     src/fs-poll.c
     src/idna.c
@@ -108,7 +119,7 @@ set(uv_sources
     src/version.c)
 
 if(WIN32)
-  list(APPEND uv_defines WIN32_LEAN_AND_MEAN _WIN32_WINNT=0x0600)
+  list(APPEND uv_defines WIN32_LEAN_AND_MEAN _WIN32_WINNT=0x0602)
   list(APPEND uv_libraries
        psapi
        user32
@@ -199,10 +210,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
        src/unix/pthread-fixes.c
        src/unix/random-getentropy.c
        src/unix/random-getrandom.c
-       src/unix/random-sysctl-linux.c)
+       src/unix/random-sysctl-linux.c
+       src/unix/epoll.c)
 endif()
 
-if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "Android|Linux|OS390")
+if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "Android|Linux")
   list(APPEND uv_sources src/unix/proctitle.c)
 endif()
 
@@ -243,7 +255,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
        src/unix/linux-syscalls.c
        src/unix/procfs-exepath.c
        src/unix/random-getrandom.c
-       src/unix/random-sysctl-linux.c)
+       src/unix/random-sysctl-linux.c
+       src/unix/epoll.c)
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
@@ -256,9 +269,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "OS390")
-  list(APPEND uv_defines PATH_MAX=255)
+  enable_language(CXX)
+  list(APPEND uv_defines PATH_MAX=1024)
   list(APPEND uv_defines _AE_BIMODAL)
   list(APPEND uv_defines _ALL_SOURCE)
+  list(APPEND uv_defines _ENHANCED_ASCII_EXT=0xFFFFFFFF)
   list(APPEND uv_defines _ISOC99_SOURCE)
   list(APPEND uv_defines _LARGE_TIME_API)
   list(APPEND uv_defines _OPEN_MSGQ_EXT)
@@ -269,14 +284,31 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OS390")
   list(APPEND uv_defines _UNIX03_SOURCE)
   list(APPEND uv_defines _UNIX03_THREADS)
   list(APPEND uv_defines _UNIX03_WITHDRAWN)
+  list(APPEND uv_defines _XOPEN_SOURCE=600)
   list(APPEND uv_defines _XOPEN_SOURCE_EXTENDED)
   list(APPEND uv_sources
        src/unix/pthread-fixes.c
        src/unix/os390.c
-       src/unix/os390-syscalls.c)
-  list(APPEND uv_cflags -Wc,DLL -Wc,exportall -Wc,xplink)
-  list(APPEND uv_libraries -Wl,xplink)
-  list(APPEND uv_test_libraries -Wl,xplink)
+       src/unix/os390-syscalls.c
+       src/unix/os390-proctitle.c)
+  list(APPEND uv_cflags
+       -q64
+       -qascii
+       -qexportall
+       -qgonumber
+       -qlongname
+       -qlibansi
+       -qfloat=IEEE
+       -qtune=10
+       -qarch=10
+       -qasm
+       -qasmlib=sys1.maclib:sys1.modgen)
+  find_library(ZOSLIB
+    NAMES zoslib
+    PATHS ${ZOSLIB_DIR}
+    PATH_SUFFIXES lib
+  )
+  list(APPEND uv_libraries ${ZOSLIB})
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "OS400")
@@ -293,9 +325,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OS400")
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
-  list(APPEND uv_defines __EXTENSIONS__ _XOPEN_SOURCE=500)
+  list(APPEND uv_defines __EXTENSIONS__ _XOPEN_SOURCE=500 _REENTRANT)
   list(APPEND uv_libraries kstat nsl sendfile socket)
-  list(APPEND uv_sources src/unix/no-proctitle.c src/unix/sunos.c)
+  list(APPEND uv_sources
+       src/unix/no-proctitle.c
+       src/unix/sunos.c)
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Haiku")
@@ -318,7 +352,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "QNX")
     src/unix/bsd-ifaddrs.c
     src/unix/no-proctitle.c
     src/unix/no-fsevents.c)
-  list(APPEND uv_cflags -fno-strict-aliasing)
   list(APPEND uv_libraries socket)
 endif()
 
@@ -340,6 +373,10 @@ target_include_directories(uv
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
   PRIVATE
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
+if(CMAKE_SYSTEM_NAME STREQUAL "OS390")
+  target_include_directories(uv PUBLIC $<BUILD_INTERFACE:${ZOSLIB_DIR}/include>)
+  set_target_properties(uv PROPERTIES LINKER_LANGUAGE CXX)
+endif()
 target_link_libraries(uv ${uv_libraries})
 
 add_library(uv_a STATIC ${uv_sources})
@@ -351,6 +388,10 @@ target_include_directories(uv_a
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
   PRIVATE
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
+if(CMAKE_SYSTEM_NAME STREQUAL "OS390")
+  target_include_directories(uv_a PUBLIC $<BUILD_INTERFACE:${ZOSLIB_DIR}/include>)
+  set_target_properties(uv_a PROPERTIES LINKER_LANGUAGE CXX)
+endif()
 target_link_libraries(uv_a ${uv_libraries})
 
 if(LIBUV_BUILD_TESTS)
@@ -448,6 +489,9 @@ if(LIBUV_BUILD_TESTS)
        test/test-metrics.c
        test/test-multiple-listen.c
        test/test-mutexes.c
+       test/test-not-readable-nor-writable-on-read-error.c
+       test/test-not-readable-on-eof.c
+       test/test-not-writable-after-shutdown.c
        test/test-osx-select.c
        test/test-pass-always.c
        test/test-ping-pong.c
@@ -466,6 +510,7 @@ if(LIBUV_BUILD_TESTS)
        test/test-poll-close-doesnt-corrupt-stack.c
        test/test-poll-close.c
        test/test-poll-closesocket.c
+       test/test-poll-multiple-handles.c
        test/test-poll-oob.c
        test/test-poll.c
        test/test-process-priority.c
@@ -479,6 +524,7 @@ if(LIBUV_BUILD_TESTS)
        test/test-semaphore.c
        test/test-shutdown-close.c
        test/test-shutdown-eof.c
+       test/test-shutdown-simultaneous.c
        test/test-shutdown-twice.c
        test/test-signal-multiple-loops.c
        test/test-signal-pending-on-close.c
@@ -572,6 +618,11 @@ if(LIBUV_BUILD_TESTS)
   add_test(NAME uv_test_a
            COMMAND uv_run_tests_a
            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+  if(CMAKE_SYSTEM_NAME STREQUAL "OS390")
+    set_target_properties(uv_run_benchmarks_a PROPERTIES LINKER_LANGUAGE CXX)
+    set_target_properties(uv_run_tests PROPERTIES LINKER_LANGUAGE CXX)
+    set_target_properties(uv_run_tests_a PROPERTIES LINKER_LANGUAGE CXX)
+  endif()
 endif()
 
 if(UNIX OR MINGW)

deps/libuv/CONTRIBUTING.md

@@ -23,11 +23,11 @@ The stable branch is effectively frozen; patches that change the libuv
 API/ABI or affect the run-time behavior of applications get rejected.
 
 In case of doubt, open an issue in the [issue tracker][], post your question
-to the [libuv mailing list], or contact one of [project maintainers][] on [IRC][].
+to the [libuv discussions forum], or message the [libuv mailing list].
 
-Especially do so if you plan to work on something big.  Nothing is more
-frustrating than seeing your hard work go to waste because your vision
-does not align with that of a project maintainers.
+Especially do so if you plan to work on something big. Nothing is more
+frustrating than seeing your hard work go to waste because your vision does not
+align with that of the [project maintainers].
 
 
 ### BRANCH
@@ -166,6 +166,6 @@ not send out notifications when you add commits.
 
 [issue tracker]: https://github.com/libuv/libuv/issues
 [libuv mailing list]: http://groups.google.com/group/libuv
-[IRC]: http://webchat.freenode.net/?channels=libuv
+[libuv discussions forum]: https://github.com/libuv/libuv/discussions
 [Google C/C++ style guide]: https://google.github.io/styleguide/cppguide.html
 [project maintainers]: https://github.com/libuv/libuv/blob/master/MAINTAINERS.md