Muldersoft/cURL-build-win32
Muldersoft/cURL-build-win32
1
0
Fork 0
Code Issues Pull Requests Projects Releases 18 Wiki Activity

Updated patch for new SSH2 version.

Browse Source
This commit is contained in:
LoRd_MuldeR 2023-09-23 20:46:06 +02:00
parent 147599a189
commit 73183ff0ff
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
patch/ssh2_session.diff
View File

@ -1,17 +1,20 @@
diff --git "a/D:\\_Sandbox\\curl\\libssh2-x64\\src\\session.c.orig" "b/D:\\_Sandbox\\curl\\libssh2-x64\\src\\session.c" src/session.c | 4 +++-
index e439acd..476a497 100644 1 file changed, 3 insertions(+), 1 deletion(-)
--- "a/src/session.c"
+++ "b/src/session.c" diff --git a/src/session.c b/src/session.c
@@ -58,6 +58,8 @@ index a4d602b..e653f1d 100644
#include "mac.h" --- a/src/session.c
#include "misc.h" +++ b/src/session.c
@@ -66,6 +66,8 @@
#undef libssh2_usec_t
#endif
+#define DIFFTIME(_b,_a) ((double)((_b) - (_a))) +#define DIFFTIME(_b,_a) ((double)((_b) - (_a)))
+ +
/* libssh2_default_alloc /* libssh2_default_alloc
*/ */
static static
@@ -610,7 +612,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);
@ -19,4 +22,4 @@ index e439acd..476a497 100644
+ elapsed_ms = (long)(1000*DIFFTIME(now, start_time)); + elapsed_ms = (long)(1000*DIFFTIME(now, start_time));
if(elapsed_ms > session->api_timeout) { if(elapsed_ms > session->api_timeout) {
return _libssh2_error(session, LIBSSH2_ERROR_TIMEOUT, return _libssh2_error(session, LIBSSH2_ERROR_TIMEOUT,
"API timeout expired"); "API timeout expired");