diff options
Diffstat (limited to '99.patch')
| -rw-r--r-- | 99.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/99.patch b/99.patch new file mode 100644 index 0000000..a0f740a --- /dev/null +++ b/99.patch @@ -0,0 +1,35 @@ +From cf2e24d788d9d31715c272197417cb03283acd40 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Thu, 23 Dec 2021 14:43:51 +0100 +Subject: [PATCH] call json_encode using call_user_func on PHP 7 + +--- + scout_utils.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/scout_utils.c b/scout_utils.c +index 424c782..ea975db 100644 +--- a/scout_utils.c ++++ b/scout_utils.c +@@ -89,11 +89,21 @@ void safely_copy_argument_zval_as_scalar(zval *original_to_copy, zval *destinati + if (strcasecmp("stream-context", zend_rsrc_list_get_rsrc_type(Z_RES_P(original_to_copy))) == 0) { + php_stream_context *stream_context = zend_fetch_resource_ex(original_to_copy, NULL, php_le_stream_context()); + if (stream_context != NULL) { ++#if PHP_VERSION_ID < 80000 ++ /* ext/json can be shared */ ++ zval args[1], jsonenc; ++ ++ ZVAL_STRINGL(&jsonenc, "json_encode", sizeof("json_encode")-1); ++ args[0] = stream_context->options; ++ call_user_function(EG(function_table), NULL, &jsonenc, destination, 1, args); ++#else ++ /* ext/json is always there */ + smart_str json_encode_string_buffer = {0}; + php_json_encode(&json_encode_string_buffer, &stream_context->options, 0); + smart_str_0(&json_encode_string_buffer); + ZVAL_STR_COPY(destination, json_encode_string_buffer.s); + smart_str_free(&json_encode_string_buffer); ++#endif + return; + } + } |