summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjvoisin2020-11-29 20:46:48 +0100
committerjvoisin2020-11-29 20:46:48 +0100
commit69719e42994c0e42ae45124acef7835955a5272d (patch)
tree094a7f10b7274b0525c30be4caaa4f253e6df2be
parentea7c76bce6a4704db867210acfad7cab73106ef2 (diff)
Fix zend_write booking type
The signature was changed in PHP8: https://github.com/php/php-src/commit/e15409b43cacf711608189c299191f2969ea331c
-rw-r--r--src/sp_disabled_functions.c4
-rw-r--r--src/sp_disabled_functions.h6
2 files changed, 9 insertions, 1 deletions
diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c
index 7e6ca6a..c5ea437 100644
--- a/src/sp_disabled_functions.c
+++ b/src/sp_disabled_functions.c
@@ -626,7 +626,11 @@ int hook_disabled_functions(void) {
626 626
627zend_write_func_t zend_write_default = NULL; 627zend_write_func_t zend_write_default = NULL;
628 628
629#if PHP_VERSION_ID >= 80000
630size_t hook_echo(const char* str, size_t str_length) {
631#else
629int hook_echo(const char* str, size_t str_length) { 632int hook_echo(const char* str, size_t str_length) {
633#endif
630 zend_string* zs = zend_string_init(str, str_length, 0); 634 zend_string* zs = zend_string_init(str, str_length, 0);
631 635
632 should_disable_ht( 636 should_disable_ht(
diff --git a/src/sp_disabled_functions.h b/src/sp_disabled_functions.h
index baf40dd..fd9b9b9 100644
--- a/src/sp_disabled_functions.h
+++ b/src/sp_disabled_functions.h
@@ -3,8 +3,12 @@
3 3
4extern zend_write_func_t zend_write_default; 4extern zend_write_func_t zend_write_default;
5 5
6int hook_disabled_functions(void); 6#if PHP_VERSION_ID >= 80000
7size_t hook_echo(const char *, size_t);
8#else
7int hook_echo(const char *, size_t); 9int hook_echo(const char *, size_t);
10#endif
11int hook_disabled_functions(void);
8void should_disable_ht(zend_execute_data *, const char *, const zend_string *, 12void should_disable_ht(zend_execute_data *, const char *, const zend_string *,
9 const char *, const sp_list_node *, const HashTable *); 13 const char *, const sp_list_node *, const HashTable *);
10void should_drop_on_ret_ht(const zval *, const char *, 14void should_drop_on_ret_ht(const zval *, const char *,