Skip to content

Commit 1d0e521

Browse files
saghulrvagg
authored andcommitted
deps: upgrade libuv to 1.7.3
PR-URL: #2310 Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: cjihrig - Colin Ihrig <cjihrig@gmail.com>
1 parent ce04b73 commit 1d0e521

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+2772
-651
lines changed

deps/uv/AUTHORS

+19
Original file line numberDiff line numberDiff line change
@@ -200,3 +200,22 @@ farblue68 <farblue68@gmail.com>
200200
Jason Williams <necmon@yahoo.com>
201201
Igor Soarez <igorsoarez@gmail.com>
202202
Miodrag Milanovic <mmicko@gmail.com>
203+
Cheng Zhao <zcbenz@gmail.com>
204+
Michael Neumann <mneumann@think.localnet>
205+
Stefano Cristiano <stefanocristiano82@gmail.com>
206+
heshamsafi <hesham.safi.eldeen@gmail.com>
207+
A. Hauptmann <andreashauptmann@t-online.de>
208+
John McNamee <jpm@microwiz.com>
209+
Yosuke Furukawa <yosuke.furukawa@gmail.com>
210+
Santiago Gimeno <santiago.gimeno@quantion.es>
211+
guworks <ground.up.works@gmail.com>
212+
RossBencina <rossb@audiomulch.com>
213+
Roger A. Light <roger@atchoo.org>
214+
chenttuuvv <chenttuuvv@yahoo.com>
215+
Richard Lau <riclau@uk.ibm.com>
216+
ronkorving <rkorving@wizcorp.jp>
217+
Corbin Simpson <MostAwesomeDude@gmail.com>
218+
Zachary Hamm <zsh@imipolexg.org>
219+
Karl Skomski <karl@skomski.com>
220+
Jeremy Whitlock <jwhitlock@apache.org>
221+
Willem Thiart <himself@willemthiart.com>

deps/uv/ChangeLog

+160
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,163 @@
1+
2015.08.28, Version 1.7.3 (Stable), 93877b11c8b86e0a6befcda83a54555c1e36e4f0
2+
3+
Changes since version 1.7.2:
4+
5+
* threadpool: fix thread starvation bug (Ben Noordhuis)
6+
7+
8+
2015.08.25, Version 1.7.2 (Stable), 4d13a013fcfa72311f0102751fdc7951873f466c
9+
10+
Changes since version 1.7.1:
11+
12+
* unix, win: make uv_loop_init return on error (Willem Thiart)
13+
14+
* win: reset pipe handle for pipe servers (Saúl Ibarra Corretgé)
15+
16+
* win: fix replacing pipe handle for pipe servers (Saúl Ibarra Corretgé)
17+
18+
* win: fix setting pipe pending instances after bind (Saúl Ibarra Corretgé)
19+
20+
21+
2015.08.20, Version 1.7.1 (Stable), 44f4b6bd82d8ae4583ccc4768a83af778ef69f85
22+
23+
Changes since version 1.7.0:
24+
25+
* doc: document the procedure for verifying releases (Saúl Ibarra Corretgé)
26+
27+
* doc: add note about Windows binaries to the README (Saúl Ibarra Corretgé)
28+
29+
* doc: use long GPG IDs in MAINTAINERS.md (Saúl Ibarra Corretgé)
30+
31+
* Revert "stream: squelch ECONNRESET error if already closed" (Saúl Ibarra
32+
Corretgé)
33+
34+
* doc: clarify uv_read_stop() is idempotent (Corbin Simpson)
35+
36+
* unix: OpenBSD's setsockopt needs an unsigned char for multicast (Zachary
37+
Hamm)
38+
39+
* test: Fix two memory leaks (Karl Skomski)
40+
41+
* unix,win: return EINVAL on nullptr args in uv_fs_{read,write} (Karl Skomski)
42+
43+
* win: set accepted TCP sockets as non-inheritable (Saúl Ibarra Corretgé)
44+
45+
* unix: remove superfluous parentheses in fs macros (Ben Noordhuis)
46+
47+
* unix: don't copy arguments for sync fs requests (Ben Noordhuis)
48+
49+
* test: plug small memory leak in unix test runner (Ben Noordhuis)
50+
51+
* unix,windows: allow NULL loop for sync fs requests (Ben Noordhuis)
52+
53+
* unix,windows: don't assert on unknown error code (Ben Noordhuis)
54+
55+
* stream: retry write on EPROTOTYPE on OSX (Brian White)
56+
57+
* common: fix use of snprintf on Windows (Saúl Ibarra Corretgé)
58+
59+
* tests: refactored fs watch_dir tests for stability (Jeremy Whitlock)
60+
61+
62+
2015.08.06, Version 1.7.0 (Stable), 415a865d6365ba58d02b92b89d46ba5d7744ec8b
63+
64+
Changes since version 1.6.1:
65+
66+
* win,stream: add slot to remember CRT fd (Bert Belder)
67+
68+
* win,pipe: properly close when created from CRT fd (Bert Belder)
69+
70+
* win,pipe: don't close fd 0-2 (Bert Belder)
71+
72+
* win,tty: convert fd -> handle safely (Bert Belder)
73+
74+
* win,tty: properly close when created from CRT fd (Bert Belder)
75+
76+
* win,tty: don't close fd 0-2 (Bert Belder)
77+
78+
* win,fs: don't close fd 0-2 (Bert Belder)
79+
80+
* win: include "malloc.h" (Cheng Zhao)
81+
82+
* windows: MSVC 2015 has C99 inline (Jason Williams)
83+
84+
* dragonflybsd: fixes for nonblocking and cloexec (Michael Neumann)
85+
86+
* dragonflybsd: use sendfile(2) for uv_fs_sendfile (Michael Neumann)
87+
88+
* dragonflybsd: fix uv_exepath (Michael Neumann)
89+
90+
* win,fs: Fixes align(8) directive on mingw (Stefano Cristiano)
91+
92+
* unix, win: prevent replacing fd in uv_{udp,tcp,pipe}_t (Saúl Ibarra Corretgé)
93+
94+
* win: move logic to set socket non-inheritable to uv_tcp_set_socket (Saúl
95+
Ibarra Corretgé)
96+
97+
* unix, win: add ability to create tcp/udp sockets early (Saúl Ibarra Corretgé)
98+
99+
* test: retry select() on EINTR, honor milliseconds (Ben Noordhuis)
100+
101+
* unix: consolidate tcp and udp bind error (Saúl Ibarra Corretgé)
102+
103+
* test: conditionally skip udp_ipv6_multicast_join6 (heshamsafi)
104+
105+
* core: add UV_VERSION_HEX macro (Saúl Ibarra Corretgé)
106+
107+
* doc: add section with version-checking macros and functions (Saúl Ibarra
108+
Corretgé)
109+
110+
* tty: cleanup handle if uv_tty_init fails (Saúl Ibarra Corretgé)
111+
112+
* darwin: save a fd when FSEvents is used (Saúl Ibarra Corretgé)
113+
114+
* win: fix returning thread id in uv_thread_self (Saúl Ibarra Corretgé)
115+
116+
* common: use offsetof for QUEUE_DATA (Saúl Ibarra Corretgé)
117+
118+
* win: remove UV_HANDLE_CONNECTED (A. Hauptmann)
119+
120+
* docs: add Windows specific note for uv_fs_open (Saúl Ibarra Corretgé)
121+
122+
* doc: add note about uv_fs_scandir (Saúl Ibarra Corretgé)
123+
124+
* test,unix: reduce stack size of watchdog threads (Ben Noordhuis)
125+
126+
* win: add support for recursive file watching (Saúl Ibarra Corretgé)
127+
128+
* win,tty: support consoles with non-default colors (John McNamee)
129+
130+
* doc: add missing variable name (Yosuke Furukawa)
131+
132+
* stream: squelch ECONNRESET error if already closed (Santiago Gimeno)
133+
134+
* build: remove ancient condition from common.gypi (Saúl Ibarra Corretgé)
135+
136+
* tests: skip some tests when network is unreachable (Luca Bruno)
137+
138+
* build: proper support for android cross compilation (guworks)
139+
140+
* android: add missing include to pthread-fixes.c (RossBencina)
141+
142+
* test: fix compilation warning (Saúl Ibarra Corretgé)
143+
144+
* doc: add a note about uv_dirent_t.type (Saúl Ibarra Corretgé)
145+
146+
* win,test: fix shared library build (Saúl Ibarra Corretgé)
147+
148+
* test: fix compilation warning (Santiago Gimeno)
149+
150+
* build: add experimental Windows installer (Roger A. Light)
151+
152+
* threadpool: send signal only when queue is empty (chenttuuvv)
153+
154+
* aix: fix uv_exepath with relative paths (Richard Lau)
155+
156+
* build: fix version syntax in AppVeyor file (Saúl Ibarra Corretgé)
157+
158+
* unix: allow nbufs > IOV_MAX in uv_fs_{read,write} (ronkorving)
159+
160+
1161
2015.06.06, Version 1.6.1 (Stable), 30c8be07bb78a66fdee5141626bf53a49a17094a
2162

3163
Changes since version 1.6.0:

deps/uv/MAINTAINERS.md

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
2+
# Project Maintainers
3+
4+
libuv is currently managed by the following individuals:
5+
6+
* **Ben Noordhuis** ([@bnoordhuis](https://github.com/bnoordhuis))
7+
- GPG key: D77B 1E34 243F BAF0 5F8E 9CC3 4F55 C8C8 46AB 89B9 (pubkey-bnoordhuis)
8+
* **Bert Belder** ([@piscisaureus](https://github.com/piscisaureus))
9+
* **Fedor Indutny** ([@indutny](https://github.com/indutny))
10+
- GPG key: AF2E EA41 EC34 47BF DD86 FED9 D706 3CCE 19B7 E890 (pubkey-indutny)
11+
* **Saúl Ibarra Corretgé** ([@saghul](https://github.com/saghul))
12+
- GPG key: FDF5 1936 4458 319F A823 3DC9 410E 5553 AE9B C059 (pubkey-saghul)
13+
14+
## Storing a maintainer key in Git
15+
16+
It's quite handy to store a maintainer's signature as a git blob, and have
17+
that object tagged and signed with such key.
18+
19+
Export your public key:
20+
21+
$ gpg --armor --export saghul@gmail.com > saghul.asc
22+
23+
Store it as a blob on the repo:
24+
25+
$ git hash-object -w saghul.asc
26+
27+
The previous command returns a hash, copy it. For the sake of this explanation,
28+
we'll assume it's 'abcd1234'. Storing the blob in git is not enough, it could
29+
be garbage collected since nothing references it, so we'll create a tag for it:
30+
31+
$ git tag -s pubkey-saghul abcd1234
32+
33+
Commit the changes and push:
34+
35+
$ git push origin pubkey-saghul
36+

deps/uv/Makefile.am

+4
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,10 @@ test_run_tests_SOURCES = test/blackhole-server.c \
186186
test/test-ping-pong.c \
187187
test/test-pipe-bind-error.c \
188188
test/test-pipe-connect-error.c \
189+
test/test-pipe-connect-multiple.c \
189190
test/test-pipe-connect-prepare.c \
190191
test/test-pipe-getsockname.c \
192+
test/test-pipe-pending-instances.c \
191193
test/test-pipe-sendmsg.c \
192194
test/test-pipe-server-close.c \
193195
test/test-pipe-close-stdout-read-stdin.c \
@@ -215,6 +217,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
215217
test/test-tcp-close-accept.c \
216218
test/test-tcp-close-while-connecting.c \
217219
test/test-tcp-close.c \
220+
test/test-tcp-create-socket-early.c \
218221
test/test-tcp-connect-error-after-write.c \
219222
test/test-tcp-connect-error.c \
220223
test/test-tcp-connect-timeout.c \
@@ -240,6 +243,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
240243
test/test-timer.c \
241244
test/test-tty.c \
242245
test/test-udp-bind.c \
246+
test/test-udp-create-socket-early.c \
243247
test/test-udp-dgram-too-big.c \
244248
test/test-udp-ipv6.c \
245249
test/test-udp-multicast-interface.c \

deps/uv/README.md

+36
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,42 @@ also serve as API specification and usage examples.
8989
These resources are not handled by libuv maintainers and might be out of
9090
date. Please verify it before opening new issues.
9191

92+
## Downloading
93+
94+
libuv can be downloaded either from the
95+
[GitHub repository](https://github.com/libuv/libuv)
96+
or from the [downloads site](http://dist.libuv.org/dist/).
97+
98+
Starting with libuv 1.7.0, binaries for Windows are also provided. This is to
99+
be considered EXPERIMENTAL.
100+
101+
Before verifying the git tags or signature files, importing the relevant keys
102+
is necessary. Key IDs are listed in the
103+
[MAINTAINERS](https://github.com/libuv/libuv/blob/master/MAINTAINERS.md)
104+
file, but are also available as git blob objects for easier use.
105+
106+
Importing a key the usual way:
107+
108+
$ gpg --keyserver pool.sks-keyservers.net \
109+
--recv-keys AE9BC059
110+
111+
Importing a key from a git blob object:
112+
113+
$ git show pubkey-saghul | gpg --import
114+
115+
### Verifying releases
116+
117+
Git tags are signed with the developer's key, they can be verified as follows:
118+
119+
$ git verify-tag v1.6.1
120+
121+
Starting with libuv 1.7.0, the tarballs stored in the
122+
[downloads site](http://dist.libuv.org/dist/) are signed and an accomanying
123+
signature file sit alongside each. Once both the release tarball and the
124+
signature file are downloaded, the file can be verified as follows:
125+
126+
$ gpg --verify libuv-1.7.0.tar.gz.sign
127+
92128
## Build Instructions
93129

94130
For GCC there are two build methods: via autotools or via [GYP][].

deps/uv/android-configure

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $1/build/tools/make-standalone-toolchain.sh \
66
--toolchain=arm-linux-androideabi-4.8 \
77
--arch=arm \
88
--install-dir=$TOOLCHAIN \
9-
--platform=android-9
9+
--platform=android-21
1010
export PATH=$TOOLCHAIN/bin:$PATH
1111
export AR=arm-linux-androideabi-ar
1212
export CC=arm-linux-androideabi-gcc
@@ -16,5 +16,5 @@ export PLATFORM=android
1616

1717
if [ $2 -a $2 == 'gyp' ]
1818
then
19-
./gyp_uv.py -Dtarget_arch=arm -DOS=android
19+
./gyp_uv.py -Dtarget_arch=arm -DOS=android -f make-android
2020
fi

deps/uv/appveyor.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
version: v1.7.3.build{build}
2+
3+
install:
4+
- cinst -y nsis
5+
6+
matrix:
7+
fast_finish: true
8+
allow_failures:
9+
- platform: x86
10+
configuration: Release
11+
- platform: x64
12+
configuration: Release
13+
14+
platform:
15+
- x86
16+
- x64
17+
18+
configuration:
19+
- Release
20+
21+
build_script:
22+
# Fixed tag version number if using a tag.
23+
- cmd: if "%APPVEYOR_REPO_TAG%" == "true" set APPVEYOR_BUILD_VERSION=%APPVEYOR_REPO_TAG_NAME%
24+
# vcbuild overwrites the platform variable.
25+
- cmd: set ARCH=%platform%
26+
- cmd: vcbuild.bat release %ARCH% shared
27+
28+
after_build:
29+
- '"%PROGRAMFILES(x86)%\NSIS\makensis" /DVERSION=%APPVEYOR_BUILD_VERSION% /DARCH=%ARCH% libuv.nsi'
30+
31+
artifacts:
32+
- name: Installer
33+
path: 'libuv-*.exe'
34+
35+
cache:
36+
- C:\projects\libuv\build\gyp

deps/uv/common.gypi

+4-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@
3737
'OTHER_CFLAGS': [ '-Wno-strict-aliasing' ],
3838
},
3939
'conditions': [
40-
['OS != "win"', {
41-
'defines': [ 'EV_VERIFY=2' ],
42-
}],
40+
['OS == "android"', {
41+
'cflags': [ '-fPIE' ],
42+
'ldflags': [ '-fPIE', '-pie' ]
43+
}]
4344
]
4445
},
4546
'Release': {

deps/uv/configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1414

1515
AC_PREREQ(2.57)
16-
AC_INIT([libuv], [1.6.1], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.7.3], [https://github.com/libuv/libuv/issues])
1717
AC_CONFIG_MACRO_DIR([m4])
1818
m4_include([m4/libuv-extra-automake-flags.m4])
1919
m4_include([m4/as_case.m4])

deps/uv/docs/src/check.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ N/A
3131
API
3232
---
3333

34-
.. c:function:: int uv_check_init(uv_loop_t*, uv_check_t* check)
34+
.. c:function:: int uv_check_init(uv_loop_t* loop, uv_check_t* check)
3535
3636
Initialize the handle.
3737

deps/uv/docs/src/errors.rst

+4-2
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,10 @@ API
322322

323323
.. c:function:: const char* uv_strerror(int err)
324324
325-
Returns the error message for the given error code.
325+
Returns the error message for the given error code. Leaks a few bytes
326+
of memory when you call it with an unknown error code.
326327
327328
.. c:function:: const char* uv_err_name(int err)
328329
329-
Returns the error name for the given error code.
330+
Returns the error name for the given error code. Leaks a few bytes
331+
of memory when you call it with an unknown error code.

0 commit comments

Comments
 (0)