From 102424724e96cc06f248582502f34b2b878eb212 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 25 Dec 2020 06:52:30 +0100 Subject: update to 4.1.2 --- PHPINFO | 8 ++++---- REFLECTION | 6 +++--- php-pecl-rdkafka4.spec | 7 +++++-- rdkafka-php8.patch | 12 ++++++++---- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/PHPINFO b/PHPINFO index 4804229..b6fa83b 100644 --- a/PHPINFO +++ b/PHPINFO @@ -2,7 +2,7 @@ rdkafka rdkafka support => enabled -version => 4.1.1 -build date => Dec 8 2020 00:00:00 -librdkafka version (runtime) => 1.5.2 -librdkafka version (build) => 1.5.2.255 +version => 4.1.2 +build date => Dec 25 2020 00:00:00 +librdkafka version (runtime) => 1.5.3 +librdkafka version (build) => 1.5.3.255 diff --git a/REFLECTION b/REFLECTION index a5d3f5d..e66caae 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #97 rdkafka version 4.1.1 ] { +Extension [ extension #98 rdkafka version 4.1.2 ] { - Constants [172] { Constant [ int RD_KAFKA_CONSUMER ] { 1 } @@ -11,8 +11,8 @@ Extension [ extension #97 rdkafka version 4.1.1 ] { Constant [ int RD_KAFKA_PURGE_F_QUEUE ] { 1 } Constant [ int RD_KAFKA_PURGE_F_INFLIGHT ] { 2 } Constant [ int RD_KAFKA_PURGE_F_NON_BLOCKING ] { 4 } - Constant [ int RD_KAFKA_VERSION ] { 17105663 } - Constant [ int RD_KAFKA_BUILD_VERSION ] { 17105663 } + Constant [ int RD_KAFKA_VERSION ] { 17105919 } + Constant [ int RD_KAFKA_BUILD_VERSION ] { 17105919 } Constant [ int RD_KAFKA_RESP_ERR__BEGIN ] { -200 } Constant [ int RD_KAFKA_RESP_ERR__BAD_MSG ] { -199 } Constant [ int RD_KAFKA_RESP_ERR__BAD_COMPRESSION ] { -198 } diff --git a/php-pecl-rdkafka4.spec b/php-pecl-rdkafka4.spec index 002105d..d5fd8dc 100644 --- a/php-pecl-rdkafka4.spec +++ b/php-pecl-rdkafka4.spec @@ -20,13 +20,13 @@ Summary: Kafka client based on librdkafka Name: %{?sub_prefix}php-pecl-%{pecl_name}4 -Version: 4.1.1 +Version: 4.1.2 Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: MIT URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz -# git checkout master; git diff 4.1.1 -- *h *.c tests/ >/tmp/pp +# git checkout master; git diff 4.1.2 -- *h *.c tests/ >/tmp/pp # + cleanup (version, produce_consume_transactional.phpt) Patch0: %{pecl_name}-php8.patch @@ -207,6 +207,9 @@ cd ../ZTS %changelog +* Fri Dec 25 2020 Remi Collet - 4.1.2-1 +- update to 4.1.2 + * Tue Dec 8 2020 Remi Collet - 4.1.1-1 - update to 4.1.1 diff --git a/rdkafka-php8.patch b/rdkafka-php8.patch index 4199489..a574191 100644 --- a/rdkafka-php8.patch +++ b/rdkafka-php8.patch @@ -1672,7 +1672,7 @@ index 71ad2f3..d44b895 100644 +void create_kafka_error(zval *return_value, const rd_kafka_error_t *error); #endif diff --git a/message.c b/message.c -index f3911f9..f4c4c7f 100644 +index d8b7dc3..f4c4c7f 100644 --- a/message.c +++ b/message.c @@ -32,7 +32,7 @@ @@ -1684,8 +1684,12 @@ index f3911f9..f4c4c7f 100644 { object_init_ex(return_value, ce_kafka_message); -@@ -51,21 +51,21 @@ void kafka_message_new(zval *return_value, const rd_kafka_message_t *message TSR - uint i; +@@ -48,24 +48,24 @@ void kafka_message_new(zval *return_value, const rd_kafka_message_t *message TSR + const void *header_value = NULL; + size_t header_size = 0; + zval headers_array; +- size_t i; ++ uint i; #endif /* HAVE_RD_KAFKA_MESSAGE_HEADERS */ - zend_update_property_long(NULL, return_value, ZEND_STRL("err"), message->err TSRMLS_CC); @@ -2915,7 +2919,7 @@ index 128fec0..677203d 100644 +void kafka_metadata_topic_minit(INIT_FUNC_ARGS); +void kafka_metadata_topic_ctor(zval *return_value, zval *zmetadata, const void *metadata_topic); diff --git a/php_rdkafka.h b/php_rdkafka.h -index 4188749..19bef56 100644 +index e007877..19bef56 100644 --- a/php_rdkafka.h +++ b/php_rdkafka.h @@ -22,7 +22,6 @@ -- cgit