1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From: Andy Postnikov <apostnikov@gmail.com>
Date: Mon, 13 Jul 2020 20:13:34 +0300
Subject: Fix compatibility with 8.0 - call_user_function_ex
---
ssh2-1.2/ssh2.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ssh2-1.2/ssh2.c b/ssh2-1.2/ssh2.c
index 5a1deef..ee60f7b 100644
--- a/ssh2-1.2/ssh2.c
+++ b/ssh2-1.2/ssh2.c
@@ -100,7 +100,7 @@ LIBSSH2_DEBUG_FUNC(php_ssh2_debug_cb)
ZVAL_STRINGL(&args[1], language, language_len);
ZVAL_LONG(&args[2], always_display);
- if (FAILURE == call_user_function_ex(NULL, NULL, data->disconnect_cb, NULL, 3, args, 0, NULL)) {
+ if (FAILURE == call_user_function(NULL, NULL, data->disconnect_cb, NULL, 3, args)) {
php_error_docref(NULL, E_WARNING, "Failure calling disconnect callback");
}
}
@@ -125,7 +125,7 @@ LIBSSH2_IGNORE_FUNC(php_ssh2_ignore_cb)
ZVAL_STRINGL(&args[0], message, message_len);
- if (FAILURE == call_user_function_ex(NULL, NULL, data->ignore_cb, &zretval, 1, args, 0, NULL)) {
+ if (FAILURE == call_user_function(NULL, NULL, data->ignore_cb, &zretval, 1, args)) {
php_error_docref(NULL, E_WARNING, "Failure calling ignore callback");
}
if (Z_TYPE_P(&zretval) != IS_UNDEF) {
@@ -155,7 +155,7 @@ LIBSSH2_MACERROR_FUNC(php_ssh2_macerror_cb)
ZVAL_STRINGL(&args[0], packet, packet_len);
- if (FAILURE == call_user_function_ex(NULL, NULL, data->macerror_cb, &zretval, 1, args, 0, NULL)) {
+ if (FAILURE == call_user_function(NULL, NULL, data->macerror_cb, &zretval, 1, args)) {
php_error_docref(NULL, E_WARNING, "Failure calling macerror callback");
} else {
retval = zval_is_true(&zretval) ? 0 : -1;
@@ -188,7 +188,7 @@ LIBSSH2_DISCONNECT_FUNC(php_ssh2_disconnect_cb)
ZVAL_STRINGL(&args[1], message, message_len);
ZVAL_STRINGL(&args[2], language, language_len);
- if (FAILURE == call_user_function_ex(NULL, NULL, data->disconnect_cb, NULL, 3, args, 0, NULL)) {
+ if (FAILURE == call_user_function(NULL, NULL, data->disconnect_cb, NULL, 3, args)) {
php_error_docref(NULL, E_WARNING, "Failure calling disconnect callback");
}
}
|
