diff options
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 4 | ||||
| -rw-r--r-- | grpc-php85.patch | 12 | ||||
| -rw-r--r-- | php-pecl-grpc.spec | 13 |
4 files changed, 26 insertions, 5 deletions
@@ -2,7 +2,7 @@ grpc grpc support => enabled -grpc module version => 1.73.0 +grpc module version => 1.74.0RC2 Directive => Local Value => Master Value grpc.enable_fork_support => 0 => 0 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #139 grpc version 1.73.0 ] { +Extension [ <persistent> extension #142 grpc version 1.74.0RC2 ] { - INI { Entry [ grpc.enable_fork_support <SYSTEM> ] @@ -57,7 +57,7 @@ Extension [ <persistent> extension #139 grpc version 1.73.0 ] { Constant [ int Grpc\CHANNEL_READY ] { 2 } Constant [ int Grpc\CHANNEL_TRANSIENT_FAILURE ] { 3 } Constant [ int Grpc\CHANNEL_FATAL_FAILURE ] { 4 } - Constant [ string Grpc\VERSION ] { 1.73.0 } + Constant [ string Grpc\VERSION ] { 1.74.0RC2 } } - Classes [7] { diff --git a/grpc-php85.patch b/grpc-php85.patch new file mode 100644 index 0000000..a21f9a2 --- /dev/null +++ b/grpc-php85.patch @@ -0,0 +1,12 @@ +diff -up ./src/php/ext/grpc/call.c.php85 ./src/php/ext/grpc/call.c +--- ./src/php/ext/grpc/call.c.php85 2025-07-17 10:28:12.598376396 +0200 ++++ ./src/php/ext/grpc/call.c 2025-07-17 10:28:45.097057429 +0200 +@@ -84,7 +84,7 @@ zval *grpc_parse_metadata_array(grpc_met + if (php_grpc_zend_hash_find(array_hash, str_key, key_len, (void **)&data) + == SUCCESS) { + if (Z_TYPE_P(data) != IS_ARRAY) { +- zend_throw_exception(zend_exception_get_default(TSRMLS_C), ++ zend_throw_exception(zend_ce_exception, + "Metadata hash somehow contains wrong types.", + 1 TSRMLS_CC); + efree(str_key); diff --git a/php-pecl-grpc.spec b/php-pecl-grpc.spec index 8a3c3d7..924e70d 100644 --- a/php-pecl-grpc.spec +++ b/php-pecl-grpc.spec @@ -22,8 +22,8 @@ %global pecl_name grpc %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{pecl_name}.ini -%global upstream_version 1.73.0 -#global upstream_prever RC2 +%global upstream_version 1.74.0 +%global upstream_prever RC2 %global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} %global _configure ../%{sources}/configure # Disable LTO (erratic crash during build) @@ -40,6 +40,7 @@ Source0: https://pecl.php.net/get/%{sources}.tgz Patch0: %{pecl_name}-build.patch Patch2: %{pecl_name}-workaround.patch Patch3: %{pecl_name}-openssl.patch +Patch4: %{pecl_name}-php85.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc >= 7.0 @@ -89,6 +90,7 @@ cd %{sources} sed -e '/boringssl-with-bazel/d' -i config.m4 rm -r third_party/boringssl-with-bazel %endif +%patch -P4 -p1 -b .php85 #sed -e '/PHP_GRPC_VERSION/s/RC3/RC2/' -i src/php/ext/grpc/version.h # Sanity check, really often broken @@ -199,6 +201,13 @@ cd ../ZTS %changelog +* Fri Jul 18 2025 Remi Collet <remi@remirepo.net> - 1.74.0~RC2-1 +- update to 1.74.0RC2 + +* Thu Jul 17 2025 Remi Collet <remi@remirepo.net> - 1.73.0-2 +- fix build with PHP 8.5.0alpha2 using private patch + reported as https://github.com/zeromq/php-zmq/pull/240 + * Wed Jun 18 2025 Remi Collet <remi@remirepo.net> - 1.73.0-1 - update to 1.73.0 |