Updated cURL to version 8.6.0 (2024-01-31).
This commit is contained in:
parent
f7ee6be8ea
commit
687881ea86
12
build.sh
12
build.sh
@ -11,7 +11,7 @@ trap 'read -p "Press any key..." x' EXIT
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
# cURL version
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
readonly MY_VERSION=8.5.0
|
||||
readonly MY_VERSION=8.6.0
|
||||
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
# Set up compiler
|
||||
@ -44,18 +44,18 @@ rm -rf "${LIBS_DIR}" && mkdir -p "${LIBS_DIR}/.pkg" "${LIBS_DIR}/bin" "${LIBS_DI
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
# Download
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/zlib.tar.gz" https://zlib.net/zlib-1.3.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/zlib.tar.gz" https://zlib.net/zlib-1.3.1.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/zstd.tar.gz" https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-1.5.5.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/brotli.tar.gz" https://github.com/google/brotli/archive/refs/tags/v1.1.0.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/openssl.tar.gz" https://github.com/quictls/openssl/archive/refs/heads/OpenSSL_1_1_1w+quic.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/rtmpdump.tar.gz" https://distfiles.macports.org/rtmpdump/f1b83c10d8beb43fcc70a6e88cf4325499f25857.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/libiconv.tar.gz" https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/gettext.tar.gz" https://ftp.gnu.org/pub/gnu/gettext/gettext-0.22.3.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/gettext.tar.gz" https://ftp.gnu.org/pub/gnu/gettext/gettext-0.22.4.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/libssh2.tar.gz" https://www.libssh2.org/download/libssh2-1.11.0.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/nghttp2.tar.gz" https://github.com/nghttp2/nghttp2/releases/download/v1.58.0/nghttp2-1.58.0.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/nghttp2.tar.gz" https://github.com/nghttp2/nghttp2/releases/download/v1.59.0/nghttp2-1.59.0.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/nghttp3.tar.gz" https://github.com/ngtcp2/nghttp3/releases/download/v1.1.0/nghttp3-1.1.0.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/ngtcp2.tar.gz" https://github.com/ngtcp2/ngtcp2/releases/download/v1.1.0/ngtcp2-1.1.0.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/libidn2.tar.gz" https://ftp.gnu.org/gnu/libidn/libidn2-2.3.4.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/ngtcp2.tar.gz" https://github.com/ngtcp2/ngtcp2/releases/download/v1.2.0/ngtcp2-1.2.0.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/libidn2.tar.gz" https://ftp.gnu.org/gnu/libidn/libidn2-2.3.7.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/libgsasl.tar.gz" https://ftp.gnu.org/gnu/gsasl/libgsasl-1.10.0.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/curl.tar.gz" https://curl.se/download/curl-${MY_VERSION}.tar.gz
|
||||
wget -4 -O "${LIBS_DIR}/.pkg/cacert.pem" https://curl.se/ca/cacert.pem
|
||||
|
||||
8
make.cmd
8
make.cmd
@ -3,10 +3,10 @@ cd /d "%~dp0"
|
||||
|
||||
set "MSYS2_DIR=C:\msys64"
|
||||
|
||||
echo "%MSYS2_DIR%\msys2_shell.cmd" -mingw32 -where "%~dp0" -c "./build.sh"
|
||||
call "%MSYS2_DIR%\msys2_shell.cmd" -mingw32 -where "%~dp0" -c "./build.sh"
|
||||
echo "%MSYS2_DIR%\msys2_shell.cmd" -mingw32 -where "%~dp0" -c "./build.sh 2>&1 | tee logfile_x86.txt"
|
||||
call "%MSYS2_DIR%\msys2_shell.cmd" -mingw32 -where "%~dp0" -c "./build.sh 2>&1 | tee logfile_x86.txt"
|
||||
|
||||
TIMEOUT /T 30 /NOBREAK > NUL
|
||||
|
||||
echo "%MSYS2_DIR%\msys2_shell.cmd" -mingw64 -where "%~dp0" -c "./build.sh"
|
||||
call "%MSYS2_DIR%\msys2_shell.cmd" -mingw64 -where "%~dp0" -c "./build.sh"
|
||||
echo "%MSYS2_DIR%\msys2_shell.cmd" -mingw64 -where "%~dp0" -c "./build.sh 2>&1 | tee logfile_x64.txt"
|
||||
call "%MSYS2_DIR%\msys2_shell.cmd" -mingw64 -where "%~dp0" -c "./build.sh 2>&1 | tee logfile_x64.txt"
|
||||
|
||||
@ -1,11 +1,16 @@
|
||||
diff --git "a/lib/nghttp2_time.c" "b/lib/nghttp2_time.c"
|
||||
index 897556f..0e4a804 100644
|
||||
--- "a/lib/nghttp2_time.c"
|
||||
+++ "b/lib/nghttp2_time.c"
|
||||
@@ -32,31 +32,16 @@
|
||||
# include <sysinfoapi.h>
|
||||
#endif /* HAVE_SYSINFOAPI_H */
|
||||
lib/nghttp2_time.c | 40 ++++++++++------------------------------
|
||||
1 file changed, 10 insertions(+), 30 deletions(-)
|
||||
|
||||
diff --git a/lib/nghttp2_time.c b/lib/nghttp2_time.c
|
||||
index 947b544..db18869 100644
|
||||
--- a/lib/nghttp2_time.c
|
||||
+++ b/lib/nghttp2_time.c
|
||||
@@ -28,36 +28,16 @@
|
||||
# include <windows.h>
|
||||
#endif /* HAVE_WINDOWS_H */
|
||||
|
||||
-#include <time.h>
|
||||
-
|
||||
-#if !defined(HAVE_GETTICKCOUNT64) || defined(__CYGWIN__)
|
||||
-static uint64_t time_now_sec(void) {
|
||||
- time_t t = time(NULL);
|
||||
@ -24,7 +29,8 @@ index 897556f..0e4a804 100644
|
||||
-
|
||||
-#if defined(HAVE_GETTICKCOUNT64) && !defined(__CYGWIN__)
|
||||
-uint64_t nghttp2_time_now_sec(void) { return GetTickCount64() / 1000; }
|
||||
-#elif defined(HAVE_CLOCK_GETTIME)
|
||||
-#elif defined(HAVE_CLOCK_GETTIME) && defined(HAVE_DECL_CLOCK_MONOTONIC) && \
|
||||
- HAVE_DECL_CLOCK_MONOTONIC
|
||||
-uint64_t nghttp2_time_now_sec(void) {
|
||||
- struct timespec tp;
|
||||
- int rv = clock_gettime(CLOCK_MONOTONIC, &tp);
|
||||
@ -41,6 +47,8 @@ index 897556f..0e4a804 100644
|
||||
+ GetSystemTimeAsFileTime(&(ftime.ft_struct));
|
||||
+ return ftime.scalar / 10000000ULL;
|
||||
}
|
||||
-#else /* (!HAVE_CLOCK_GETTIME || __CYGWIN__) && !HAVE_GETTICKCOUNT64 */
|
||||
-#else /* (!HAVE_CLOCK_GETTIME || !HAVE_DECL_CLOCK_MONOTONIC) && \
|
||||
- (!HAVE_GETTICKCOUNT64 || __CYGWIN__)) */
|
||||
-uint64_t nghttp2_time_now_sec(void) { return time_now_sec(); }
|
||||
-#endif /* (!HAVE_CLOCK_GETTIME || __CYGWIN__) && !HAVE_GETTICKCOUNT64 */
|
||||
-#endif /* (!HAVE_CLOCK_GETTIME || !HAVE_DECL_CLOCK_MONOTONIC) && \
|
||||
- (!HAVE_GETTICKCOUNT64 || __CYGWIN__)) */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user