improved patch for libhdr_histogram 0.11.7

1 files changed, 108 insertions, 3 deletions

diff --git a/hdr_histogram-lib0114.patch b/hdr_histogram-lib0114.patch
index 727a011..c53ba3a 100644
--- a/hdr_histogram-lib0114.patch
+++ b/hdr_histogram-lib0114.patch
@@ -1,7 +1,7 @@
-From 857918bdb4bf1a4faf769e01aaa3c3f5bd14021a Mon Sep 17 00:00:00 2001
+From b62e02bf30b5967f6b5514dfba025c8c8ce1a431 Mon Sep 17 00:00:00 2001
 From: Remi Collet <remi@remirepo.net>
 Date: Tue, 1 Mar 2022 10:31:21 +0100
-Subject: [PATCH] Fix for libhdr_histogram version 0.11.4
+Subject: [PATCH 1/3] Fix for libhdr_histogram version 0.11.4
 
 ---
  config.m4      | 76 ++++++++++++++++++++++++++++++--------------------
@@ -101,7 +101,7 @@ index aa4fec8..729a038 100644
      PHP_SUBST(HDRHISTOGRAM_SHARED_LIBADD)
  
 diff --git a/hdrhistogram.c b/hdrhistogram.c
-index d3595a3..cff2c18 100644
+index d3099a1..5a60a53 100644
 --- a/hdrhistogram.c
 +++ b/hdrhistogram.c
 @@ -117,17 +117,17 @@ PHP_MINFO_FUNCTION(hdrhistogram)
@@ -216,3 +216,108 @@ index d3595a3..cff2c18 100644
  
          if (res == 0) {
              hdr_register_hdr_resource(return_value, hdr);
+
+From 82a52859195755097cf3437f957ded89834533c0 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 27 Apr 2023 09:01:20 +0200
+Subject: [PATCH 2/3] improve phpinfo with extension and library version (from
+ 0.11.7)
+
+---
+ config.m4      |  3 +++
+ hdrhistogram.c | 11 +++++++++++
+ 2 files changed, 14 insertions(+)
+
+diff --git a/config.m4 b/config.m4
+index 729a038..955d15c 100644
+--- a/config.m4
++++ b/config.m4
+@@ -12,6 +12,9 @@ if test "$PHP_HDRHISTOGRAM" != "no"; then
+         LIBHDR_LIBDIR=`$PKG_CONFIG hdr_histogram --libs`
+         LIBHDR_VERSON=`$PKG_CONFIG hdr_histogram --modversion`
+         AC_MSG_RESULT(found $LIBHDR_VERSON)
++        if $PKG_CONFIG hdr_histogram --atleast-version 0.11.7; then
++            AC_DEFINE(HAVE_HDRHISTOGRAM_0_11_7,1,[ ])
++        fi
+         if $PKG_CONFIG hdr_histogram --atleast-version 0.11.4; then
+             AC_DEFINE(HAVE_HDRHISTOGRAM_0_11_4,1,[ ])
+         fi
+diff --git a/hdrhistogram.c b/hdrhistogram.c
+index 5a60a53..fff37db 100644
+--- a/hdrhistogram.c
++++ b/hdrhistogram.c
+@@ -3,8 +3,12 @@
+ #endif
+ 
+ #include "php.h"
++#include "ext/standard/info.h"
+ #include "hdr/hdr_histogram.h"
+ #include "hdr/hdr_histogram_log.h"
++#ifdef HAVE_HDRHISTOGRAM_0_11_7
++#include "hdr/hdr_histogram_version.h"
++#endif
+ #include "php_hdrhistogram.h"
+ 
+ #if PHP_VERSION_ID < 80000
+@@ -112,6 +116,13 @@ PHP_RSHUTDOWN_FUNCTION(hdrhistogram)
+ 
+ PHP_MINFO_FUNCTION(hdrhistogram)
+ {
++	php_info_print_table_start();
++
++	php_info_print_table_row(2, "hdrhistogram", "enabled");
++	php_info_print_table_row(2, "Extension version", HDR_VERSION);
++#ifdef HDR_HISTOGRAM_VERSION
++	php_info_print_table_row(2, "Library version", HDR_HISTOGRAM_VERSION);
++#endif
+ }
+ 
+ PHP_FUNCTION(hdr_init)
+
+From 21e89822c9c98ede68c0a16ece78c3323788888a Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 27 Apr 2023 09:03:59 +0200
+Subject: [PATCH 3/3] use normalized macro name
+
+---
+ hdrhistogram.c     | 6 +++---
+ php_hdrhistogram.h | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/hdrhistogram.c b/hdrhistogram.c
+index fff37db..0a241be 100644
+--- a/hdrhistogram.c
++++ b/hdrhistogram.c
+@@ -67,7 +67,7 @@ zend_module_entry hdrhistogram_module_entry = {
+     PHP_RINIT(hdrhistogram),               /* Request init callback */
+     PHP_RSHUTDOWN(hdrhistogram),           /* Request shutdown callback */
+     PHP_MINFO(hdrhistogram),               /* Module info callback */
+-    HDR_VERSION,
++    PHP_HDR_HISTOGRAM_VERSION,
+     STANDARD_MODULE_PROPERTIES
+ };
+ 
+@@ -118,8 +118,8 @@ PHP_MINFO_FUNCTION(hdrhistogram)
+ {
+ 	php_info_print_table_start();
+ 
+-	php_info_print_table_row(2, "hdrhistogram", "enabled");
+-	php_info_print_table_row(2, "Extension version", HDR_VERSION);
++	php_info_print_table_row(2, "hdrhistogram support", "enabled");
++	php_info_print_table_row(2, "Extension version", PHP_HDR_HISTOGRAM_VERSION);
+ #ifdef HDR_HISTOGRAM_VERSION
+ 	php_info_print_table_row(2, "Library version", HDR_HISTOGRAM_VERSION);
+ #endif
+diff --git a/php_hdrhistogram.h b/php_hdrhistogram.h
+index 68fd9ae..894b224 100644
+--- a/php_hdrhistogram.h
++++ b/php_hdrhistogram.h
+@@ -5,7 +5,7 @@
+ 
+ extern zend_module_entry hdrhistogram_module_entry;
+ #define phpext_hdrhistogram_ptr &hdrhistogram_module_entry
+-#define HDR_VERSION "0.4.2"
++#define PHP_HDR_HISTOGRAM_VERSION "0.4.2"
+ 
+ PHP_MINIT_FUNCTION(hdrhistogram);
+ PHP_MSHUTDOWN_FUNCTION(hdrhistogram);