diff options
| author | Remi Collet <remi@remirepo.net> | 2021-12-25 15:56:07 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2021-12-25 15:56:07 +0100 |
| commit | ca001e463828b4b64869ce7829ef4e53bdc3f69c (patch) | |
| tree | a0911e8468bf80a8b4421b5015724fb3eaff4e8c | |
| parent | 8c2f31f53ec65735658f91e9084ff319cbb664b0 (diff) | |
update to 1.5.1
drop patch merged upstream
| -rw-r--r-- | 99.patch | 35 | ||||
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-scoutapm.spec | 10 |
4 files changed, 7 insertions, 42 deletions
diff --git a/99.patch b/99.patch deleted file mode 100644 index a0f740a..0000000 --- a/99.patch +++ /dev/null @@ -1,35 +0,0 @@ -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; - } - } @@ -2,7 +2,7 @@ scoutapm scoutapm support => enabled -Version => 1.5.0 +Version => 1.5.1 curl functions => Yes file functions => Yes pdo functions => Yes @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #120 scoutapm version 1.5.0 ] { +Extension [ <persistent> extension #120 scoutapm version 1.5.1 ] { - Functions { Function [ <internal:scoutapm> function scoutapm_get_calls ] { diff --git a/php-pecl-scoutapm.spec b/php-pecl-scoutapm.spec index e29d041..f6cabf5 100644 --- a/php-pecl-scoutapm.spec +++ b/php-pecl-scoutapm.spec @@ -17,14 +17,12 @@ Summary: Native Extension Component for ScoutAPM's PHP Agent Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.5.0 +Version: 1.5.1 Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz License: PHP URL: https://pecl.php.net/package/%{pecl_name} -Patch0: https://patch-diff.githubusercontent.com/raw/scoutapp/scout-apm-php-ext/pull/99.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.1 @@ -83,8 +81,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml pushd NTS -%patch0 -p1 -b .pr99 - : Check version extver=$(sed -n '/#define PHP_SCOUTAPM_VERSION /{s/.* "//;s/".*$//;p}' zend_scoutapm.h) if test "x${extver}" != "x%{version}%{?prever}"; then @@ -218,6 +214,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Sat Dec 25 2021 Remi Collet <remi@remirepo.net> - 1.5.1-1 +- update to 1.5.1 +- drop patch merged upstream + * Thu Dec 23 2021 Remi Collet <remi@remirepo.net> - 1.5.0-1 - update to 1.5.0 - add dependency on json extension |