diff options
Diffstat (limited to 'ext/mysqli')
| -rw-r--r-- | ext/mysqli/config.m4 | 2 | ||||
| -rw-r--r-- | ext/mysqli/config.w32 | 4 | ||||
| -rw-r--r-- | ext/mysqli/mysqli.c | 6 | ||||
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 5 |
4 files changed, 13 insertions, 4 deletions
diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4 index f6c86e762b..dedd1bc4a7 100644 --- a/ext/mysqli/config.m4 +++ b/ext/mysqli/config.m4 @@ -75,7 +75,7 @@ if test "$PHP_MYSQLI" != "no"; then mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \ mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \ mysqli_exception.c mysqli_result_iterator.c $mysqli_extra_sources" - PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared) + PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_SUBST(MYSQLI_SHARED_LIBADD) PHP_INSTALL_HEADERS([ext/mysqli/php_mysqli_structs.h]) diff --git a/ext/mysqli/config.w32 b/ext/mysqli/config.w32 index ab8bcd0087..9213931393 100644 --- a/ext/mysqli/config.w32 +++ b/ext/mysqli/config.w32 @@ -23,7 +23,7 @@ if (PHP_MYSQLI != "no") { "mysqli_warning.c"; if (PHP_MYSQLI == "yes" || PHP_MYSQLI == "mysqlnd") { - EXTENSION("mysqli", mysqli_source); + EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'Using MySQL native driver'); AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library'); ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true); @@ -34,7 +34,7 @@ if (PHP_MYSQLI != "no") { CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQLI)) { - EXTENSION("mysqli", mysqli_source); + EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library'); MESSAGE("\tlibmysql build"); PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h"); diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 6d7210fe59..88b79451b2 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -537,6 +537,9 @@ PHP_INI_END() */ static PHP_GINIT_FUNCTION(mysqli) { +#if defined(COMPILE_DL_MYSQLI) && defined(ZTS) + ZEND_TSRMLS_CACHE_UPDATE; +#endif mysqli_globals->num_links = 0; mysqli_globals->num_active_persistent = 0; mysqli_globals->num_inactive_persistent = 0; @@ -1030,6 +1033,9 @@ zend_module_entry mysqli_module_entry = { /* }}} */ #ifdef COMPILE_DL_MYSQLI +#ifdef ZTS +ZEND_TSRMLS_CACHE_DEFINE; +#endif ZEND_GET_MODULE(mysqli) #endif diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index d815df3eee..cf12c5bba5 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -344,7 +344,10 @@ ZEND_END_MODULE_GLOBALS(mysqli) #ifdef ZTS -#define MyG(v) TSRMG(mysqli_globals_id, zend_mysqli_globals *, v) +#define MyG(v) ZEND_TSRMG(mysqli_globals_id, zend_mysqli_globals *, v) +#ifdef COMPILE_DL_MYSQLI +ZEND_TSRMLS_CACHE_EXTERN; +#endif #else #define MyG(v) (mysqli_globals.v) #endif |