Compare commits
No commits in common. "7df958ca6b7a18ae11e1a07f6e7ae97c2d9c91a5" and "788c86c9b5365fea3838ba7eb61efc145376c061" have entirely different histories.
7df958ca6b
...
788c86c9b5
2
build.sh
2
build.sh
@ -290,7 +290,7 @@ readonly TCP2_DIR="${WORK_DIR}/ngtcp2"
|
|||||||
rm -rf "${TCP2_DIR}" && mkdir "${TCP2_DIR}"
|
rm -rf "${TCP2_DIR}" && mkdir "${TCP2_DIR}"
|
||||||
tar -xvf "${PKGS_DIR}/ngtcp2.tar.gz" --strip-components=1 -C "${TCP2_DIR}"
|
tar -xvf "${PKGS_DIR}/ngtcp2.tar.gz" --strip-components=1 -C "${TCP2_DIR}"
|
||||||
pushd "${TCP2_DIR}"
|
pushd "${TCP2_DIR}"
|
||||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -DNDEBUG -D_WIN32_WINNT=0x0501 -I${DEPS_DIR}/include" LDFLAGS="-L${DEPS_DIR}/lib" OPENSSL_CFLAGS="-I${DEPS_DIR}/include" OPENSSL_LIBS="-L${DEPS_DIR}/lib -lssl -lcrypto -lws2_32 -lz -lcrypt32" ZLIB_CFLAGS="-I${DEPS_DIR}/include" ZLIB_LIBS="-L${DEPS_DIR}/lib -lz" ./configure --prefix="${DEPS_DIR}" --enable-lib-only --with-openssl --disable-shared
|
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -DNDEBUG -D_WIN32_WINNT=0x0501 -I${DEPS_DIR}/include" LDFLAGS="-L${DEPS_DIR}/lib" OPENSSL_CFLAGS="-I${DEPS_DIR}/include" OPENSSL_LIBS="-L${DEPS_DIR}/lib -lssl -lcrypto -lws2_32 -lz" ZLIB_CFLAGS="-I${DEPS_DIR}/include" ZLIB_LIBS="-L${DEPS_DIR}/lib -lz" ./configure --prefix="${DEPS_DIR}" --enable-lib-only --with-openssl --disable-shared
|
||||||
make && make install
|
make && make install
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
@ -2,10 +2,10 @@
|
|||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/src/session.c b/src/session.c
|
diff --git a/src/session.c b/src/session.c
|
||||||
index 2d77b05..79809cc 100644
|
index a4d602b..e653f1d 100644
|
||||||
--- a/src/session.c
|
--- a/src/session.c
|
||||||
+++ b/src/session.c
|
+++ b/src/session.c
|
||||||
@@ -68,6 +68,8 @@
|
@@ -66,6 +66,8 @@
|
||||||
#undef libssh2_usec_t
|
#undef libssh2_usec_t
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -14,7 +14,7 @@ index 2d77b05..79809cc 100644
|
|||||||
/* libssh2_default_alloc
|
/* libssh2_default_alloc
|
||||||
*/
|
*/
|
||||||
static
|
static
|
||||||
@@ -628,7 +630,7 @@ int _libssh2_wait_socket(LIBSSH2_SESSION *session, time_t start_time)
|
@@ -602,7 +604,7 @@ int _libssh2_wait_socket(LIBSSH2_SESSION *session, time_t start_time)
|
||||||
(seconds_to_next == 0 ||
|
(seconds_to_next == 0 ||
|
||||||
ms_to_next > session->api_timeout)) {
|
ms_to_next > session->api_timeout)) {
|
||||||
time_t now = time(NULL);
|
time_t now = time(NULL);
|
||||||
|
Loading…
Reference in New Issue
Block a user