diff options
| author | Remi Collet <remi@remirepo.net> | 2021-11-05 15:52:05 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2021-11-05 15:52:05 +0100 |
| commit | 4cfd1c67e44a688820cf7173865d6cea21152b70 (patch) | |
| tree | f865b902ad3262b6d4ca6b628b7a5113bc787a4f /488.patch | |
| parent | 1a5c992f2a7f6a794bf0ee26b5cb83981b078ef0 (diff) | |
add patch for MemcachedServer from
https://github.com/php-memcached-dev/php-memcached/pull/474
Diffstat (limited to '488.patch')
| -rw-r--r-- | 488.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/488.patch b/488.patch new file mode 100644 index 0000000..d630b08 --- /dev/null +++ b/488.patch @@ -0,0 +1,39 @@ +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"); |