Skip to content

Commit 3d3d48d

Browse files
indutnyindutny
committed
deps: update uv to v0.11.25
1 parent d0fc553 commit 3d3d48d

30 files changed

Lines changed: 294 additions & 108 deletions

‎deps/uv/.mailmap‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ Fedor Indutny <fedor.indutny@gmail.com> <fedor@indutny.com>
1010
Frank Denis <github@pureftpd.org>
1111
Isaac Z. Schlueter <i@izs.me>
1212
Justin Venus <justin.venus@gmail.com> <justin.venus@orbitz.com>
13-
Keno Fischer <kenof@stanford.edu> <kfischer@college.harvard.edu>
1413
Keno Fischer <kenof@stanford.edu> <kfischer+github@college.harvard.edu>
14+
Keno Fischer <kenof@stanford.edu> <kfischer@college.harvard.edu>
1515
Maciej Małecki <maciej.malecki@notimplemented.org> <me@mmalecki.com>
1616
Marc Schlaich <marc.schlaich@googlemail.com> <marc.schlaich@gmail.com>
17+
Rasmus Christian Pedersen <ruysch@outlook.com>
1718
Rasmus Pedersen <ruysch@outlook.com> <zerhacken@yahoo.com>
1819
Robert Mustacchi <rm@joyent.com> <rm@fingolfin.org>
1920
Ryan Dahl <ryan@joyent.com> <ry@tinyclouds.org>

‎deps/uv/AUTHORS‎

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ Marc Schlaich <marc.schlaich@googlemail.com>
8181
Brian Mazza <louseman@gmail.com>
8282
Elliot Saba <staticfloat@gmail.com>
8383
Ben Kelly <ben@wanderview.com>
84-
Kristian Evensen <kristian.evensen@gmail.com>
8584
Nils Maier <maierman@web.de>
8685
Nicholas Vavilov <vvnicholas@gmail.com>
8786
Miroslav Bajtoš <miro.bajtos@gmail.com>
@@ -111,48 +110,23 @@ Yazhong Liu <yorkiefixer@gmail.com>
111110
Sam Roberts <vieuxtech@gmail.com>
112111
River Tarnell <river@loreley.flyingparchment.org.uk>
113112
Nathan Sweet <nathanjsweet@gmail.com>
114-
Alex Crichton <alex@alexcrichton.com>
115113
Luca Bruno <lucab@debian.org>
116114
Trevor Norris <trev.norris@gmail.com>
117115
Oguz Bastemur <obastemur@gmail.com>
118116
Dylan Cali <calid1984@gmail.com>
119117
Austin Foxley <austinf@cetoncorp.com>
120118
Benjamin Saunders <ben.e.saunders@gmail.com>
121119
Geoffry Song <goffrie@gmail.com>
122-
Rasmus Pedersen <ruysch@outlook.com>
120+
Rasmus Christian Pedersen <ruysch@outlook.com>
123121
William Light <wrl@illest.net>
124122
Oleg Efimov <o.efimov@corp.badoo.com>
125123
Lars Gierth <larsg@systemli.org>
126-
rcp <zerhacken@yahoo.com>
127-
Alexis Campailla <alexis@janeasystems.com>
124+
Rasmus Christian Pedersen <zerhacken@yahoo.com>
128125
Justin Venus <justin.venus@gmail.com>
129-
Ben Kelly <ben@wanderview.com>
130126
Kristian Evensen <kristian.evensen@gmail.com>
131-
Sean Silva <chisophugis@gmail.com>
132127
Linus Mårtensson <linus.martensson@sonymobile.com>
133128
Navaneeth Kedaram Nambiathan <navaneethkn@gmail.com>
134-
Brent Cook <brent@boundary.com>
135-
Brian Kaisner <bkize1@gmail.com>
136-
Reini Urban <rurban@cpanel.net>
137-
Maks Naumov <maksqwe1@ukr.net>
138-
Sean Farrell <sean.farrell@rioki.org>
139-
Christoph Iserlohn <christoph.iserlohn@innoq.com>
140-
Steven Kabbes <stevenkabbes@gmail.com>
141-
Tenor Biel <tenorbiel@gmail.com>
142-
Andrej Manduch <AManduch@gmail.com>
143-
Joshua Neuheisel <joshua@neuheisel.us>
144129
Yorkie <yorkiefixer@gmail.com>
145-
Sam Roberts <vieuxtech@gmail.com>
146-
River Tarnell <river@loreley.flyingparchment.org.uk>
147-
Nathan Sweet <nathanjsweet@gmail.com>
148-
Dylan Cali <calid1984@gmail.com>
149-
Austin Foxley <austinf@cetoncorp.com>
150-
Geoffry Song <goffrie@gmail.com>
151-
Benjamin Saunders <ben.e.saunders@gmail.com>
152-
Rasmus Pedersen <ruysch@outlook.com>
153-
William Light <wrl@illest.net>
154-
Oleg Efimov <o.efimov@corp.badoo.com>
155-
Lars Gierth <larsg@systemli.org>
156130
StarWing <weasley.wx@gmail.com>
157131
thierry-FreeBSD <thierry@FreeBSD.org>
158132
Isaiah Norton <isaiah.norton@gmail.com>
@@ -161,3 +135,7 @@ David Capello <davidcapello@gmail.com>
161135
Paul Tan <pyokagan@gmail.com>
162136
Javier Hernández <jhernandez@emergya.com>
163137
Tonis Tiigi <tonistiigi@gmail.com>
138+
Norio Kobota <nori.0428@gmail.com>
139+
李港平 <chopdown@gmail.com>
140+
Chernyshev Viacheslav <astellar@ro.ru>
141+
Stephen von Takach <steve@advancedcontrol.com.au>

‎deps/uv/ChangeLog‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,42 @@
1-
2014.04.07, Version 0.11.23 (Unstable)
1+
2014.05.02, Version 0.11.25 (Unstable)
2+
3+
Changes since version 0.11.24:
4+
5+
* osx: pass const handle pointer to uv___stream_fd (Chernyshev Viacheslav)
6+
7+
* unix, windows: pass const handle ptr to uv_tcp_get*name (Chernyshev
8+
Viacheslav)
9+
10+
* common: pass const sockaddr ptr to uv_ip*_name (Chernyshev Viacheslav)
11+
12+
* unix, windows: validate flags on uv_udp|tcp_bind (Saúl Ibarra Corretgé)
13+
14+
* unix: handle case when addr is not initialized after recvmsg (Saúl Ibarra
15+
Corretgé)
16+
17+
* unix, windows: uv_now constness (Rasmus Pedersen)
18+
19+
20+
2014.04.15, Version 0.11.24 (Unstable), ed948c29f6e8c290f79325a6f0bc9ef35bcde644
21+
22+
Changes since version 0.11.23:
23+
24+
* linux: reduce file descriptor count of async pipe (Ben Noordhuis)
25+
26+
* sunos: support IPv6 qualified link-local addresses (Saúl Ibarra Corretgé)
27+
28+
* windows: fix opening of read-only stdin pipes (Alexis Campailla)
29+
30+
* windows: Fix an infinite loop in uv_spawn (Alex Crichton)
31+
32+
* windows: fix console signal handler refcount (李港平)
33+
34+
* inet: allow scopeid in uv_inet_pton (Fedor Indutny)
35+
36+
* win: always leave crit section in get_proc_title (Fedor Indutny)
37+
38+
39+
2014.04.07, Version 0.11.23 (Unstable), e54de537efcacd593f36fcaaf8b4cb9e64313275
240

341
Changes since version 0.11.22:
442

‎deps/uv/configure.ac‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1414

1515
AC_PREREQ(2.57)
16-
AC_INIT([libuv], [0.11.23], [https://github.com/joyent/libuv/issues])
16+
AC_INIT([libuv], [0.11.25], [https://github.com/joyent/libuv/issues])
1717
AC_CONFIG_MACRO_DIR([m4])
1818
m4_include([m4/libuv-extra-automake-flags.m4])
19+
m4_include([m4/as_case.m4])
1920
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects] UV_EXTRA_AUTOMAKE_FLAGS)
2021
AC_CANONICAL_HOST
2122
AC_ENABLE_SHARED

‎deps/uv/include/uv-sunos.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,6 @@
4141

4242
#endif /* defined(PORT_SOURCE_FILE) */
4343

44+
#define UV_PLATFORM_HAS_IP6_LINK_LOCAL_ADDRESS
45+
4446
#endif /* UV_SUNOS_H */

‎deps/uv/include/uv-unix.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ typedef struct {
218218
uv_buf_t bufsml[4]; \
219219

220220
#define UV_HANDLE_PRIVATE_FIELDS \
221-
int flags; \
222221
uv_handle_t* next_closing; \
222+
unsigned int flags; \
223223

224224
#define UV_STREAM_PRIVATE_FIELDS \
225225
uv_connect_t *connect_req; \

‎deps/uv/include/uv-version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#define UV_VERSION_MAJOR 0
3434
#define UV_VERSION_MINOR 11
35-
#define UV_VERSION_PATCH 23
35+
#define UV_VERSION_PATCH 25
3636
#define UV_VERSION_IS_RELEASE 1
3737

3838
#endif /* UV_VERSION_H */

‎deps/uv/include/uv-win.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,8 @@ RB_HEAD(uv_timer_tree_s, uv_timer_s);
428428
void* queue[2]; \
429429
int queue_len; \
430430
} pending_ipc_info; \
431-
uv_write_t* non_overlapped_writes_tail;
431+
uv_write_t* non_overlapped_writes_tail; \
432+
void* reserved;
432433

433434
#define UV_PIPE_PRIVATE_FIELDS \
434435
HANDLE handle; \

‎deps/uv/include/uv.h‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ UV_EXTERN void uv_update_time(uv_loop_t*);
345345
*
346346
* Use uv_hrtime() if you need sub-millisecond granularity.
347347
*/
348-
UV_EXTERN uint64_t uv_now(uv_loop_t*);
348+
UV_EXTERN uint64_t uv_now(const uv_loop_t*);
349349

350350
/*
351351
* Get backend file descriptor. Only kqueue, epoll and event ports are
@@ -695,9 +695,8 @@ UV_EXTERN int uv_write2(uv_write_t* req,
695695
* Same as `uv_write()`, but won't queue write request if it can't be completed
696696
* immediately.
697697
* Will return either:
698-
* - positive number of bytes written
699-
* - zero - if queued write is needed
700-
* - negative error code
698+
* - >= 0: number of bytes written (can be less than the supplied buffer size)
699+
* - < 0: negative error code
701700
*/
702701
UV_EXTERN int uv_try_write(uv_stream_t* handle,
703702
const uv_buf_t bufs[],
@@ -809,10 +808,12 @@ enum uv_tcp_flags {
809808
UV_EXTERN int uv_tcp_bind(uv_tcp_t* handle,
810809
const struct sockaddr* addr,
811810
unsigned int flags);
812-
UV_EXTERN int uv_tcp_getsockname(uv_tcp_t* handle, struct sockaddr* name,
813-
int* namelen);
814-
UV_EXTERN int uv_tcp_getpeername(uv_tcp_t* handle, struct sockaddr* name,
815-
int* namelen);
811+
UV_EXTERN int uv_tcp_getsockname(const uv_tcp_t* handle,
812+
struct sockaddr* name,
813+
int* namelen);
814+
UV_EXTERN int uv_tcp_getpeername(const uv_tcp_t* handle,
815+
struct sockaddr* name,
816+
int* namelen);
816817

817818
/*
818819
* Establish an IPv4 or IPv6 TCP connection. Provide an initialized TCP handle
@@ -873,8 +874,8 @@ typedef void (*uv_udp_send_cb)(uv_udp_send_t* req, int status);
873874
* discard or repurpose the read buffer.
874875
* < 0 if a transmission error was detected.
875876
* buf uv_buf_t with the received data.
876-
* addr struct sockaddr_in or struct sockaddr_in6.
877-
* Valid for the duration of the callback only.
877+
* addr struct sockaddr* containing the address of the sender.
878+
* Can be NULL. Valid for the duration of the callback only.
878879
* flags One or more OR'ed UV_UDP_* constants.
879880
* Right now only UV_UDP_PARTIAL is used.
880881
*/
@@ -2055,8 +2056,8 @@ UV_EXTERN int uv_ip4_addr(const char* ip, int port, struct sockaddr_in* addr);
20552056
UV_EXTERN int uv_ip6_addr(const char* ip, int port, struct sockaddr_in6* addr);
20562057

20572058
/* Convert binary addresses to strings */
2058-
UV_EXTERN int uv_ip4_name(struct sockaddr_in* src, char* dst, size_t size);
2059-
UV_EXTERN int uv_ip6_name(struct sockaddr_in6* src, char* dst, size_t size);
2059+
UV_EXTERN int uv_ip4_name(const struct sockaddr_in* src, char* dst, size_t size);
2060+
UV_EXTERN int uv_ip6_name(const struct sockaddr_in6* src, char* dst, size_t size);
20602061

20612062
/* Cross-platform IPv6-capable implementation of the 'standard' inet_ntop */
20622063
/* and inet_pton functions. On success they return 0. If an error */

‎deps/uv/src/inet.c‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ static int inet_pton6(const char *src, unsigned char *dst) {
225225
curtok = src;
226226
seen_xdigits = 0;
227227
val = 0;
228-
while ((ch = *src++) != '\0') {
228+
while ((ch = *src++) != '\0' && ch != '%') {
229229
const char *pch;
230230

231231
if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
@@ -256,7 +256,19 @@ static int inet_pton6(const char *src, unsigned char *dst) {
256256
continue;
257257
}
258258
if (ch == '.' && ((tp + sizeof(struct in_addr)) <= endp)) {
259-
int err = inet_pton4(curtok, tp);
259+
int err;
260+
261+
/* Scope id present, parse ipv4 addr without it */
262+
pch = strchr(curtok, '%');
263+
if (pch != NULL) {
264+
char tmp[sizeof "255.255.255.255"];
265+
266+
memcpy(tmp, curtok, pch - curtok);
267+
curtok = tmp;
268+
src = pch;
269+
}
270+
271+
err = inet_pton4(curtok, tp);
260272
if (err == 0) {
261273
tp += sizeof(struct in_addr);
262274
seen_xdigits = 0;

0 commit comments

Comments
 (0)