diff options
| -rw-r--r-- | 452.patch | 39 | ||||
| -rw-r--r-- | 488.patch | 39 | ||||
| -rw-r--r-- | PHPINFO | 4 | ||||
| -rw-r--r-- | REFLECTION | 4 | ||||
| -rw-r--r-- | php-pecl-memcached.spec | 27 |
5 files changed, 18 insertions, 95 deletions
diff --git a/452.patch b/452.patch deleted file mode 100644 index 499bcd4..0000000 --- a/452.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5921cdaad46356750e6a0cdaec474a6de55960e5 Mon Sep 17 00:00:00 2001 -From: git-hulk <hulk.website@gmail.com> -Date: Sun, 23 Feb 2020 20:31:16 +0800 -Subject: [PATCH] FIX: store_retry_count shouldn't be set implicitly - -It's wired that store commands would be auto-retry implicitly while the default value of store_retry_count was 2, as well as the timeout, would be 3 times in those store commands which may confuse users. IMHO, the retry should be set explicitly instead of implicitly. ---- - memcached.ini | 4 ++-- - php_memcached.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/memcached.ini b/memcached.ini -index 5ed79bdb..79c7ef7b 100644 ---- a/memcached.ini -+++ b/memcached.ini -@@ -131,8 +131,8 @@ - ; This mechanism allows transparent fail-over to secondary servers when - ; set/increment/decrement/setMulti operations fail on the desired server in a multi-server - ; environment. --; the default is 2 --;memcached.store_retry_count = 2 -+; the default is 0 -+;memcached.store_retry_count = 0 - - ; Sets the default for consistent hashing for new connections. - ; (To configure consistent hashing for session connections, -diff --git a/php_memcached.c b/php_memcached.c -index 50636952..272ec381 100644 ---- a/php_memcached.c -+++ b/php_memcached.c -@@ -401,7 +401,7 @@ PHP_INI_BEGIN() - MEMC_INI_ENTRY("compression_factor", "1.3", OnUpdateReal, compression_factor) - MEMC_INI_ENTRY("compression_threshold", "2000", OnUpdateLong, compression_threshold) - MEMC_INI_ENTRY("serializer", SERIALIZER_DEFAULT_NAME, OnUpdateSerializer, serializer_name) -- MEMC_INI_ENTRY("store_retry_count", "2", OnUpdateLong, store_retry_count) -+ MEMC_INI_ENTRY("store_retry_count", "0", OnUpdateLong, store_retry_count) - - MEMC_INI_BOOL ("default_consistent_hash", "0", OnUpdateBool, default_behavior.consistent_hash_enabled) - MEMC_INI_BOOL ("default_binary_protocol", "0", OnUpdateBool, default_behavior.binary_protocol_enabled) diff --git a/488.patch b/488.patch deleted file mode 100644 index d630b08..0000000 --- a/488.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 13ba74317d7a94f87b9d30e6297fb39142c04d36 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 27 Jul 2021 08:35:08 +0200 -Subject: [PATCH] Improve phpinfo information - display libmemcached-awesome - when used (since 1.1.1) - display both builtime and runtime versions when - different - ---- - php_memcached.c | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/php_memcached.c b/php_memcached.c -index d49cbeb4..0f42a97f 100644 ---- a/php_memcached.c -+++ b/php_memcached.c -@@ -4300,7 +4300,22 @@ PHP_MINFO_FUNCTION(memcached) - php_info_print_table_start(); - php_info_print_table_header(2, "memcached support", "enabled"); - php_info_print_table_row(2, "Version", PHP_MEMCACHED_VERSION); -- php_info_print_table_row(2, "libmemcached version", memcached_lib_version()); -+ -+#ifdef LIBMEMCACHED_AWESOME -+ if (strcmp(LIBMEMCACHED_VERSION_STRING, memcached_lib_version())) { -+ php_info_print_table_row(2, "libmemcached-awesome headers version", LIBMEMCACHED_VERSION_STRING); -+ php_info_print_table_row(2, "libmemcached-awesome library version", memcached_lib_version()); -+ } else { -+ php_info_print_table_row(2, "libmemcached-awesome version", memcached_lib_version()); -+ } -+#else -+ if (strcmp(LIBMEMCACHED_VERSION_STRING, memcached_lib_version())) { -+ php_info_print_table_row(2, "libmemcached headers version", LIBMEMCACHED_VERSION_STRING); -+ php_info_print_table_row(2, "libmemcached library version", memcached_lib_version()); -+ } else { -+ php_info_print_table_row(2, "libmemcached version", memcached_lib_version()); -+ } -+#endif - - #ifdef HAVE_MEMCACHED_SASL - php_info_print_table_row(2, "SASL support", "yes"); @@ -2,7 +2,7 @@ memcached memcached support => enabled -Version => 3.1.6-dev +Version => 3.2.0RC1 libmemcached-awesome version => 1.1.1 SASL support => yes Session support => yes @@ -34,7 +34,7 @@ memcached.compression_type => fastlz => fastlz memcached.compression_factor => 1.3 => 1.3 memcached.compression_threshold => 2000 => 2000 memcached.serializer => igbinary => igbinary -memcached.store_retry_count => 2 => 2 +memcached.store_retry_count => 0 => 0 memcached.default_consistent_hash => Off => Off memcached.default_binary_protocol => Off => Off memcached.default_connect_timeout => 0 => 0 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #113 memcached version 3.1.6-dev ] { +Extension [ <persistent> extension #113 memcached version 3.2.0RC1 ] { - Dependencies { Dependency [ session (Required) ] @@ -78,7 +78,7 @@ Extension [ <persistent> extension #113 memcached version 3.1.6-dev ] { Current = 'igbinary' } Entry [ memcached.store_retry_count <ALL> ] - Current = '2' + Current = '0' } Entry [ memcached.default_consistent_hash <ALL> ] Current = '0' diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec index 3713f27..946b1dd 100644 --- a/php-pecl-memcached.spec +++ b/php-pecl-memcached.spec @@ -30,11 +30,11 @@ # After 40-igbinary, 40-json, 40-msgpack %global ini_name 50-%{pecl_name}.ini -%global upstream_version 3.1.6 -%global upstream_prever dev +%global upstream_version 3.2.0 +%global upstream_prever RC1 # upstream use dev => alpha => beta => RC # make RPM happy DEV => alpha => beta => rc -%global upstream_lower DEV +%global upstream_lower rc1 Summary: Extension to work with the Memcached caching daemon @@ -46,11 +46,6 @@ URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz -# revert change store_retry_count default (keep 3.1.5 behavior) -Patch0: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/452.patch -# improve phpinfo -Patch10: https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/488.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-pear @@ -168,9 +163,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -R -b .pr452 -%patch10 -p1 -b .pr488 - %if %{with fastlz} rm -r fastlz sed -e '/name=.fastlz/d' -i ../package.xml @@ -178,8 +170,8 @@ sed -e '/name=.fastlz/d' -i ../package.xml # Check version as upstream often forget to update this extver=$(sed -n '/#define PHP_MEMCACHED_VERSION/{s/.* "//;s/".*$//;p}' php_memcached.h) -if test "x${extver}" != "x%{upstream_version}%{?upstream_prever:-%{upstream_prever}}"; then - : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever:-%{upstream_prever}}. +if test "x${extver}" != "x%{upstream_version}%{?upstream_prever:%{upstream_prever}}"; then + : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever:%{upstream_prever}}. : Update the macro and rebuild. exit 1 fi @@ -300,6 +292,12 @@ fi %check +%if "%{php_version}" < "7.3" +# ::1:50770 vs [::1]:%s +rm ?TS/tests/memcachedserver6.phpt +%endif + + OPT="-n" [ -f %{php_extdir}/igbinary.so ] && OPT="$OPT -d extension=igbinary.so" [ -f %{php_extdir}/json.so ] && OPT="$OPT -d extension=json.so" @@ -370,6 +368,9 @@ exit $ret %changelog +* Mon Mar 7 2022 Remi Collet <remi@remirepo.net> - 3.2.0~rc1-1 +- update to 3.2.0RC1 + * Thu Mar 3 2022 Remi Collet <remi@remirepo.net> - 3.1.6~DEV-1 - update to 3.1.6-dev (2022-03-02) |