summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-11-19 10:41:30 +0100
committerRemi Collet <remi@php.net>2021-11-19 10:41:30 +0100
commit0610a05a7b2b04277f9baf0ae3157800023a0460 (patch)
treeede1f4b75945642c6d10fb300a32a95685fc85d7
parent5e58ecc2632f025321b6b518b81a129df19b9b32 (diff)
update to 1.42.0HEADmaster
-rw-r--r--PHPINFO2
-rw-r--r--REFLECTION4
-rw-r--r--grpc-noatfork.patch9
-rw-r--r--php-pecl-grpc.spec5
4 files changed, 11 insertions, 9 deletions
diff --git a/PHPINFO b/PHPINFO
index 1d47046..df2e288 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
grpc
grpc support => enabled
-grpc module version => 1.42.0RC1
+grpc module version => 1.42.0
Directive => Local Value => Master Value
grpc.enable_fork_support => 0 => 0
diff --git a/REFLECTION b/REFLECTION
index a044b92..d813346 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #128 grpc version 1.42.0RC1 ] {
+Extension [ <persistent> extension #128 grpc version 1.42.0 ] {
- INI {
Entry [ grpc.enable_fork_support <SYSTEM> ]
@@ -60,7 +60,7 @@ Extension [ <persistent> extension #128 grpc version 1.42.0RC1 ] {
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.42.0RC1 }
+ Constant [ string Grpc\VERSION ] { 1.42.0 }
}
- Classes [7] {
diff --git a/grpc-noatfork.patch b/grpc-noatfork.patch
index abf96c7..ebbf655 100644
--- a/grpc-noatfork.patch
+++ b/grpc-noatfork.patch
@@ -1,12 +1,11 @@
diff -Naurp a/NTS/config.m4 b/NTS/config.m4
--- a/NTS/config.m4 2020-02-11 10:37:11.093473672 +0000
+++ b/NTS/config.m4 2020-02-11 10:38:28.551693692 +0000
-@@ -1030,7 +1030,7 @@ if test "$PHP_GRPC" != "no"; then
+@@ -1060,7 +1060,6 @@ if test "$PHP_GRPC" != "no"; then
, $ext_shared, , -fvisibility=hidden \
-DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN \
-D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 \
-- -DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1)
-+ )
+- -DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1 \
+ -DGRPC_XDS_USER_AGENT_NAME_SUFFIX='"\"PHP\""' \
+ -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.42.0\""')
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/census)
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel)
diff --git a/php-pecl-grpc.spec b/php-pecl-grpc.spec
index ecc5f64..d8c9972 100644
--- a/php-pecl-grpc.spec
+++ b/php-pecl-grpc.spec
@@ -21,7 +21,7 @@
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global ini_name 40-%{pecl_name}.ini
%global upstream_version 1.42.0
-%global upstream_prever RC1
+#global upstream_prever RC1
Summary: General RPC framework
Name: %{?sub_prefix}php-pecl-%{pecl_name}
@@ -229,6 +229,9 @@ cd ../ZTS
%changelog
+* Fri Nov 19 2021 Remi Collet <remi@remirepo.net> - 1.42.0-1
+- update to 1.42.0
+
* Tue Nov 9 2021 Remi Collet <remi@remirepo.net> - 1.42.0~RC1-1
- update to 1.42.0RC1