Merge branch '6.x' into 7.x

Author: arnaud-lb

.github/workflows/test.yml

@@ -82,7 +82,7 @@ jobs:
                 librdkafka: 'master'
                 experimental: true
 
-        runs-on: 'ubuntu-20.04'
+        runs-on: 'ubuntu-24.04'
         continue-on-error: ${{ !!matrix.experimental }}
         env:
             PHP_VERSION: ${{ matrix.php }}
@@ -98,12 +98,12 @@ jobs:
               with:
                   path: 'php-rdkafka'
 
-            - uses: actions/cache@v2
+            - uses: actions/cache@v4
               with:
                   path: ~/build-cache/php
                   key: ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.php }}-${{ matrix.memcheck }}
 
-            - uses: actions/cache@v2
+            - uses: actions/cache@v4
               with:
                   path: ~/build-cache/librdkafka
                   key: ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.librdkafka }}

kafka_consumer.c

@@ -141,6 +141,7 @@ PHP_METHOD(RdKafka_KafkaConsumer, __construct)
     }
 
     if (!has_group_id(conf)) {
+        zend_restore_error_handling(&error_handling);
         if (conf) {
             rd_kafka_conf_destroy(conf);
         }