summaryrefslogtreecommitdiffstats
path: root/14.patch
diff options
context:
space:
mode:
Diffstat (limited to '14.patch')
-rw-r--r--14.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/14.patch b/14.patch
new file mode 100644
index 0000000..0191414
--- /dev/null
+++ b/14.patch
@@ -0,0 +1,51 @@
+From 42e38feb2bd06b0504d0a5efe2f22de332b8de9d Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 26 Jun 2018 10:10:48 +0200
+Subject: [PATCH] fix for PHP 7.3
+
+---
+ hprose_common.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/hprose_common.c b/hprose_common.c
+index f7ecdde..a2de5f5 100644
+--- a/hprose_common.c
++++ b/hprose_common.c
+@@ -158,12 +158,15 @@ zend_fcall_info_cache __get_fcall_info_cache(zval *obj, char *name, int32_t len
+ lcname = zend_str_tolower_dup(fname, flen);
+ #if PHP_MAJOR_VERSION < 7
+ if (zend_hash_find(&ce->function_table, lcname, flen + 1, (void **) &fptr) == FAILURE) {
++ efree(lcname);
++ zend_throw_exception_ex(NULL, 0 TSRMLS_CC,
++ "Method %s::%s() does not exist", ce->name, fname);
+ #else
+ if ((fptr = zend_hash_str_find_ptr(&ce->function_table, lcname, flen)) == NULL) {
+-#endif
+ efree(lcname);
+ zend_throw_exception_ex(NULL, 0 TSRMLS_CC,
+- "Method %s::%s() does not exist", ce->name, fname);
++ "Method %s::%s() does not exist", ZSTR_VAL(ce->name), fname);
++#endif
+ return fcc;
+ }
+ fcc.function_handler = fptr;
+@@ -199,7 +202,9 @@ zend_fcall_info_cache __get_fcall_info_cache(zval *obj, char *name, int32_t len
+ if (lcname) {
+ efree(lcname);
+ }
++#if PHP_VERSION_ID < 70300
+ fcc.initialized = 1;
++#endif
+ return fcc;
+ }
+
+@@ -761,7 +766,9 @@ zend_class_entry *__create_php_object(char *class_name, int32_t len, zval *retur
+ fci.params = params;
+ fci.no_separation = 1;
+
++#if PHP_VERSION_ID < 70300
+ fcc.initialized = 1;
++#endif
+ fcc.function_handler = constructor;
+ fcc.calling_scope = scope;
+ fcc.called_scope = Z_OBJCE_P(return_value);