diff options
author | Remi Collet <remi@remirepo.net> | 2021-10-06 06:58:30 +0200 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2021-10-06 06:58:30 +0200 |
commit | 5d4802bad15d8875f3e7cc570e02e4e3aa2e1ef4 (patch) | |
tree | dfc530a737306b0ff103a88bd42450519f038300 /1.patch | |
parent | be2cbc1bc1736f5c0233b2f26bdd2e75d317d739 (diff) |
update to 1.0.1
drop patch merged upstream
add patch for PHP 8.1 from
https://github.com/wikimedia/php-excimer/pull/2
display extension version in phpinfo from
https://github.com/wikimedia/php-excimer/pull/3
enable ZTS build
Diffstat (limited to '1.patch')
-rw-r--r-- | 1.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/1.patch b/1.patch deleted file mode 100644 index a2a6286..0000000 --- a/1.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 435049e9b4b55955b77d32e29f7ea7df12799668 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 2 Mar 2021 08:48:09 +0100 -Subject: [PATCH] fix [-Wincompatible-pointer-types] with PHP 8 - ---- - excimer_log.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/excimer_log.c b/excimer_log.c -index 4d5f74e..4c6b844 100644 ---- a/excimer_log.c -+++ b/excimer_log.c -@@ -408,10 +408,17 @@ static void excimer_log_array_incr(HashTable *ht, zend_string *sp_key, zend_long - } - } - -+#if PHP_VERSION_ID < 80000 - static int excimer_log_aggr_compare(const void *a, const void *b) - { - zval *zp_a = &((Bucket*)a)->val; - zval *zp_b = &((Bucket*)b)->val; -+#else -+static int excimer_log_aggr_compare(Bucket *a, Bucket *b) -+{ -+ zval *zp_a = &a->val; -+ zval *zp_b = &b->val; -+#endif - - zval *zp_a_incl = zend_hash_str_find(Z_ARRVAL_P(zp_a), "inclusive", sizeof("inclusive")-1); - zval *zp_b_incl = zend_hash_str_find(Z_ARRVAL_P(zp_b), "inclusive", sizeof("inclusive")-1); |