Skip to content

Commit 1885c94

Browse files
author
Li ZHOU
committed
upgrade to libuv 1.16
1 parent b47f9d1 commit 1885c94

File tree

413 files changed

+1074
-94
lines changed

Some content is hidden

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

413 files changed

+1074
-94
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ compiler:
44
- clang
55
env:
66
global:
7-
- LIBUV_VER=1.15.0
7+
- LIBUV_VER=1.16.0
88
- WOLFSSL_VER=3.11.0-stable
99
- OPENSSL_VER=1.1.0
1010
before_install:

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ project(mysocks)
3535
find_package(OpenSSL)
3636
IF (OPENSSL_FOUND)
3737
IF (OPENSSL_VERSION VERSION_LESS 1.1)
38-
include_directories(gnulib/lib libmd5-rfc libuv-1.15.0/include OpenSSL_1_1_0/include wolfssl-3.11.0-stable)
38+
include_directories(gnulib/lib libmd5-rfc libuv-1.16.0/include OpenSSL_1_1_0/include wolfssl-3.11.0-stable)
3939
ELSE()
40-
include_directories(gnulib/lib libmd5-rfc libuv-1.15.0/include ${OPENSSL_INCLUDE_DIR} wolfssl-3.11.0-stable)
40+
include_directories(gnulib/lib libmd5-rfc libuv-1.16.0/include ${OPENSSL_INCLUDE_DIR} wolfssl-3.11.0-stable)
4141
ENDIF()
42-
include_directories(gnulib/lib libmd5-rfc libuv-1.15.0/include OpenSSL_1_1_0/in
42+
include_directories(gnulib/lib libmd5-rfc libuv-1.16.0/include OpenSSL_1_1_0/in
4343
clude wolfssl-3.11.0-stable)
4444
ENDIF()
4545
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
@@ -52,7 +52,7 @@ SET(CMAKE_C_FLAGS_RELEASE "$ENV{CFLAGS} -DNDEBUG")
5252
IF (MSVC)
5353
set (CMAKE_C_FLAGS "-D_WIN32_WINNT=0x0600 -D_GNU_SOURCE -DHAVE_UNISTD_H=0 -DWIN32_LEAN_AND_MEAN ${CMAKE_C_FLAGS}")
5454
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCMTD")
55-
link_directories( libuv-1.15.0/$(ConfigurationName)/lib OpenSSL_1_1_0 wolfssl-3.11.0-stable/Debug)
55+
link_directories( libuv-1.16.0/$(ConfigurationName)/lib OpenSSL_1_1_0 wolfssl-3.11.0-stable/Debug)
5656
add_executable(ssclient gnulib/lib/arcfour.c libmd5-rfc/md5.c src/client.c src/cipher.c src/getopt.c src/main.c src/s5.c src/server.c src/util.c)
5757
target_link_libraries(ssclient iphlpapi psapi userenv libuv ws2_32)
5858
add_executable(ssclient-openssl src/client.c src/cipher-openssl.c src/getopt.c src/main.c src/s5.c src/server.c src/util.c)
@@ -80,7 +80,7 @@ ELSE()
8080
SET(CMAKE_C_FLAGS "-DHAVE_UNISTD_H=1 ${CMAKE_C_FLAGS}")
8181
SET(CMAKE_C_FLAGS_DEBUG "-DHAVE_UNISTD_H=1 ${CMAKE_C_FLAGS_DEBUG}")
8282
SET(CMAKE_C_FLAGS_RELEASE "-DHAVE_UNISTD_H=1 ${CMAKE_C_FLAGS_RELEASE}")
83-
link_directories(libuv-1.15.0/.libs OpenSSL_1_1_0 wolfssl-3.11.0-stable/src/.libs)
83+
link_directories(libuv-1.16.0/.libs OpenSSL_1_1_0 wolfssl-3.11.0-stable/src/.libs)
8484
add_executable(ssclient gnulib/lib/arcfour.c libmd5-rfc/md5.c src/client.c src/cipher.c src/main.c src/s5.c src/server.c src/util.c)
8585
target_link_libraries(ssclient uv )
8686
add_executable(ssclient-openssl src/client.c src/cipher-openssl.c src/main.c src/s5.c src/server.c src/util.c)

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM alpine:3.3
66
MAINTAINER lzh <[email protected]>
77

88
ARG MYSOCKS_URL=https://github.com/zhou0/mysocks/archive/0.5.9.tar.gz
9-
ARG LIBUV_URL=https://github.com/libuv/libuv/archive/v1.15.0.tar.gz
9+
ARG LIBUV_URL=https://github.com/libuv/libuv/archive/v1.16.0.tar.gz
1010
ARG WOLFSSL_URL=https://github.com/wolfSSL/wolfssl/archive/v3.11.0-stable.tar.gz
1111
RUN set -ex && \
1212
apk add --no-cache --virtual .build-deps \
@@ -21,7 +21,7 @@ RUN set -ex && \
2121
openssl-dev \
2222
tar \
2323
&& \
24-
curl -sSL $LIBUV_URL | tar xz && cd libuv-1.15.0 && \
24+
curl -sSL $LIBUV_URL | tar xz && cd libuv-1.16.0 && \
2525
./autogen.sh && ./configure --prefix=/usr --disable-static && make && \
2626
make install && cd .. && \
2727
curl -sSL $WOLFSSL_URL | tar xz && cd wolfssl-3.11.0-stable && \
@@ -49,4 +49,4 @@ build/release && cd build/release && \
4949
cd ../../.. && \
5050
apk add --no-cache --virtual .run-deps $runDeps && \
5151
apk del .build-deps && \
52-
rm -fr libuv-1.15.0 && rm -fr wolfssl-3.11.0-stable && rm -fr mysocks-0.5.9
52+
rm -fr libuv-1.16.0 && rm -fr wolfssl-3.11.0-stable && rm -fr mysocks-0.5.9
1.11 MB
Binary file not shown.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,3 +315,6 @@ darobs <[email protected]>
315315
Zheng, Lei <[email protected]>
316316
Carlo Marcelo Arenas Belón <[email protected]>
317317
Scott Parker <[email protected]>
318+
Wade Brainerd <[email protected]>
319+
320+
Pekka Nikander <[email protected]>
Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,47 @@
1-
2017.10.03, Version 1.15.0 (Stable)
1+
2017.11.07, Version 1.16.0 (Stable)
2+
3+
Changes since version 1.15.0:
4+
5+
* win: change st_blksize from `2048` to `4096` (Joran Dirk Greef)
6+
7+
* unix,win: add fs open flags, map O_DIRECT|O_DSYNC (Joran Dirk Greef)
8+
9+
* win, fs: fix non-symlink reparse points (Wade Brainerd)
10+
11+
* test: fix -Wstrict-prototypes warnings (Ben Noordhuis)
12+
13+
* unix, windows: map ENOTTY errno (Ben Noordhuis)
14+
15+
* unix: fall back to fsync() if F_FULLFSYNC fails (Joran Dirk Greef)
16+
17+
* unix: do not close invalid kqueue fd after fork (jBarz)
18+
19+
* zos: reset epoll data after fork (jBarz)
20+
21+
* zos: skip fork_threadpool_queue_work_simple (jBarz)
22+
23+
* test: keep platform_output as first test (Bartosz Sosnowski)
24+
25+
* win: fix non-English dlopen error message (Bartosz Sosnowski)
26+
27+
* unix,win: add uv_os_getppid() (cjihrig)
28+
29+
* test: fix const qualification compiler warning (Ben Noordhuis)
30+
31+
* doc: mark uv_default_loop() as not thread safe (rayrase)
32+
33+
* win, pipe: null-initialize stream->shutdown_req (Jameson Nash)
34+
35+
* tty, win: get SetWinEventHook pointer at startup (Bartosz Sosnowski)
36+
37+
* test: no extra new line in skipped test output (Bartosz Sosnowski)
38+
39+
* pipe: allow access from other users (Bartosz Sosnowski)
40+
41+
* unix,win: add uv_if_{indextoname,indextoiid} (Pekka Nikander)
42+
43+
44+
2017.10.03, Version 1.15.0 (Stable), 8b69ce1419d2958011d415a636810705c36c2cc2
245

346
Changes since version 1.14.1:
447

0 commit comments

Comments
 (0)