Skip to content

Commit d1e6a13

Browse files
committed
Upgrade libuv to fe18438
1 parent 4980686 commit d1e6a13

Some content is hidden

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

94 files changed

+12528
-736
lines changed

deps/uv/.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
<alan@prettyrobots.com> <alan@blogometer.com>
77
San-Tai Hsu <vanilla@fatpipi.com>
88
Isaac Z. Schlueter <i@izs.me>
9+
Saúl Ibarra Corretgé <saghul@gmail.com>

deps/uv/AUTHORS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@ Matthew Sporleder <msporleder@gmail.com>
2424
Erick Tryzelaar <erick.tryzelaar@gmail.com>
2525
Isaac Z. Schlueter <i@izs.me>
2626
Pieter Noordhuis <pcnoordhuis@gmail.com>
27+
Marek Jelen <marek@jelen.biz>
28+
Fedor Indutny <fedor.indutny@gmail.com>
29+
Saúl Ibarra Corretgé <saghul@gmail.com>

deps/uv/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ Implemented:
3030

3131
* Thread pool scheduling `uv_queue_work`
3232

33+
* ANSI escape code controlled TTY `uv_tty_t`
34+
3335
In-progress:
3436

3537
* File system events (Currently supports inotify, `ReadDirectoryChangesW`
3638
and will support kqueue and event ports in the near future.)
3739
`uv_fs_event_t`
3840

39-
* VT100 TTY `uv_tty_t`
40-
4141
* Socket sharing between processes `uv_ipc_t`
4242

4343

deps/uv/config-mingw.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ CFLAGS=$(CPPFLAGS) -g --std=gnu89 -D_WIN32_WINNT=0x0501 -Isrc/ares/config_win32
2828
LINKFLAGS=-lm
2929

3030
CARES_OBJS += src/ares/windows_port.o
31+
CARES_OBJS += src/ares/ares_platform.o
3132
WIN_SRCS=$(wildcard src/win/*.c)
3233
WIN_OBJS=$(WIN_SRCS:.c=.o)
3334

deps/uv/include/ares.h

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
/* Copyright 1998, 2009 by the Massachusetts Institute of Technology.
3-
* Copyright (C) 2007-2010 by Daniel Stenberg
3+
* Copyright (C) 2007-2011 by Daniel Stenberg
44
*
55
* Permission to use, copy, modify, and distribute this
66
* software and its documentation for any purpose and without
@@ -96,10 +96,19 @@ typedef int ares_socklen_t;
9696
# include <netinet/in.h>
9797
# include <sys/socket.h>
9898
# include <tcp.h>
99+
#elif defined(_WIN32_WCE)
100+
# ifndef WIN32_LEAN_AND_MEAN
101+
# define WIN32_LEAN_AND_MEAN
102+
# endif
103+
# include <windows.h>
104+
# include <winsock.h>
99105
#elif defined(WIN32)
106+
# ifndef WIN32_LEAN_AND_MEAN
107+
# define WIN32_LEAN_AND_MEAN
108+
# endif
109+
# include <windows.h>
100110
# include <winsock2.h>
101111
# include <ws2tcpip.h>
102-
# include <windows.h>
103112
#else
104113
# include <sys/socket.h>
105114
# include <netinet/in.h>

deps/uv/include/ares_version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
#define ARES_VERSION_MAJOR 1
99
#define ARES_VERSION_MINOR 7
10-
#define ARES_VERSION_PATCH 4
10+
#define ARES_VERSION_PATCH 5
1111
#define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
1212
(ARES_VERSION_MINOR<<8)|\
1313
(ARES_VERSION_PATCH))
14-
#define ARES_VERSION_STR "1.7.4"
14+
#define ARES_VERSION_STR "1.7.5-DEV"
1515

1616
#if (ARES_VERSION >= 0x010700)
1717
# define CARES_HAVE_ARES_LIBRARY_INIT 1

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@
3333

3434
#include <sys/types.h>
3535
#include <sys/socket.h>
36-
#include <netdb.h>
3736
#include <netinet/in.h>
3837
#include <netinet/tcp.h>
39-
38+
#include <arpa/inet.h>
39+
#include <netdb.h>
40+
#include <termios.h>
4041

4142
/* Note: May be cast to struct iovec. See writev(2). */
4243
typedef struct {
@@ -183,6 +184,8 @@ typedef int uv_file;
183184
#define UV_WORK_PRIVATE_FIELDS \
184185
eio_req* eio;
185186

186-
#define UV_TTY_PRIVATE_FIELDS /* empty */
187+
#define UV_TTY_PRIVATE_FIELDS \
188+
struct termios orig_termios; \
189+
int mode;
187190

188191
#endif /* UV_UNIX_H */

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,7 @@ RB_HEAD(uv_timer_tree_s, uv_timer_s);
7575
uv_idle_t* next_idle_handle; \
7676
ares_channel ares_chan; \
7777
int ares_active_sockets; \
78-
uv_timer_t ares_polling_timer; \
79-
/* Last error code */ \
80-
uv_err_t last_error;
78+
uv_timer_t ares_polling_timer;
8179

8280
#define UV_REQ_TYPE_PRIVATE \
8381
/* TODO: remove the req suffix */ \
@@ -151,7 +149,7 @@ RB_HEAD(uv_timer_tree_s, uv_timer_s);
151149

152150
#define UV_TCP_PRIVATE_FIELDS \
153151
SOCKET socket; \
154-
uv_err_t bind_error; \
152+
int bind_error; \
155153
union { \
156154
struct { uv_tcp_server_fields }; \
157155
struct { uv_tcp_connection_fields }; \

deps/uv/include/uv.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,12 @@ int uv_tty_init(uv_loop_t*, uv_tty_t*, uv_file fd);
619619
*/
620620
int uv_tty_set_mode(uv_tty_t*, int mode);
621621

622+
/*
623+
* To be called when the program exits. Resets TTY settings to default
624+
* values for the next process to take over.
625+
*/
626+
void uv_tty_reset_mode();
627+
622628
/*
623629
* Gets the current Window size. On success zero is returned.
624630
*/

deps/uv/src/ares/CHANGES

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
Changelog for the c-ares project
22

3+
Version 1.7.5 (August 16, 2011)
4+
5+
Fixed:
6+
7+
o detection of semicolon comments in resolv.conf
8+
o avoid using system's inet_net_pton affected by the WLB-2008080064 advisory
9+
o replacement ares_inet_net_pton affected by the WLB-2008080064 advisory
10+
o replacement ares_inet_ntop affected by potential out of bounds write
11+
o added install target to Makefile.msvc
12+
o only fall back to AF_INET searches when looking for AF_UNSPEC addresses
13+
o fixed ares_parse_*_reply memory leaks
14+
o Use correct sizeof in ares_getnameinfo()
15+
o IPv6-on-windows: find DNS servers correctly
16+
o man pages: docs for the c-ares utility programs
17+
o getservbyport replacement for Win CE
18+
o config_sortlist: (win32) missing else
19+
o advance_tcp_send_queue: avoid NULL ptr dereference
20+
o configure: fix a bashism
21+
o ares_expand_name: Fix encoded length for indirect root
22+
323
Version 1.7.4 (December 9, 2010)
424

525
Changed:

0 commit comments

Comments
 (0)