[pecl-database-pdo_ibm] fixup-20260903: reinistate globals init for TSRM cache
| From: | Calvin Buckley | Date: | Thu, 03 Sep 2026 17:46:06 +0000 |
| Subject: | [pecl-database-pdo_ibm] fixup-20260903: reinistate globals init for TSRM cache | ||
| Groups: | php.pecl.cvs | ||
| Request: | Send a blank email to pecl-cvs+get-28675@lists.php.net to get a copy of this message | ||
Author: Calvin Buckley (NattyNarwhal)
Date: 2026-09-03T14:36:29-03:00
Commit: https://github.com/php/pecl-database-pdo_ibm/commit/fb5c124dc8951b885513ab7b1b06a04c6d4014c8
Raw diff: https://github.com/php/pecl-database-pdo_ibm/commit/fb5c124dc8951b885513ab7b1b06a04c6d4014c8.diff
reinistate globals init for TSRM cache
avoids a segfault. unsure if this should really be a GINIT though.
Changed paths:
M pdo_ibm.c
Diff:
diff --git a/pdo_ibm.c b/pdo_ibm.c
index 0581106..d0b9e9d 100644
--- a/pdo_ibm.c
+++ b/pdo_ibm.c
@@ -103,10 +103,21 @@ PHP_INI_END()
REGISTER_PDO_CLASS_CONST_LONG("I5_" base_name, value)
#endif
+/* {{{ php_pdo_ibm_init_globals
+ */
+static void php_pdo_ibm_init_globals(zend_pdo_ibm_globals *pdo_ibm_globals)
+{
+#if defined(ZTS) && defined(COMPILE_DL_PDO_IBM)
+ ZEND_TSRMLS_CACHE_UPDATE();
+#endif
+}
+/* }}} */
+
/* {{{ PHP_MINIT_FUNCTION
*/
PHP_MINIT_FUNCTION(pdo_ibm)
{
+ ZEND_INIT_MODULE_GLOBALS(pdo_ibm, php_pdo_ibm_init_globals, NULL);
#ifdef PASE
/* Only PASE has INI entries right now. */
REGISTER_INI_ENTRIES();