Skip to content

Commit 98a8481

Browse files
weltlingweltling
committed
converted some ext/mysql* and fixed ext/zlib
1 parent 236857c commit 98a8481

13 files changed

+40
-13
lines changed

‎ext/mysql/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ if test "$PHP_MYSQL" != "no"; then
158158
fi
159159

160160
AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])
161-
PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared)
161+
PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
162162
PHP_SUBST(MYSQL_SHARED_LIBADD)
163163

164164
if test "$PHP_MYSQL" = "yes" || test "$PHP_MYSQL" = "mysqlnd"; then

‎ext/mysql/config.w32

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ if (PHP_MYSQL != "no") {
1010
PHP_MYSQL = "no";
1111
WARNING("mysql not enabled; mysqlnd is not enabled");
1212
} else {
13-
EXTENSION("mysql", "php_mysql.c");
13+
EXTENSION("mysql", "php_mysql.c", PHP_MYSQL_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
1414
AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
1515
MESSAGE("\tusing mysqlnd build");
1616
}
1717
} else if (PHP_MYSQL != "") {
1818
if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) &&
1919
CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL",
2020
PHP_MYSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) {
21-
EXTENSION("mysql", "php_mysql.c");
21+
EXTENSION("mysql", "php_mysql.c", PHP_MYSQL_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
2222
AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
2323
MESSAGE("\tusing libmysql");
2424
} else {

‎ext/mysql/php_mysql.c

+6
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,9 @@ zend_module_entry mysql_module_entry = {
358358
/* }}} */
359359

360360
#ifdef COMPILE_DL_MYSQL
361+
#ifdef ZTS
362+
ZEND_TSRMLS_CACHE_DEFINE;
363+
#endif
361364
ZEND_GET_MODULE(mysql)
362365
#endif
363366

@@ -518,6 +521,9 @@ PHP_INI_END()
518521
*/
519522
static PHP_GINIT_FUNCTION(mysql)
520523
{
524+
#if defined(COMPILE_DL_MYSQL) && defined(ZTS)
525+
ZEND_TSRMLS_CACHE_UPDATE;
526+
#endif
521527
mysql_globals->num_persistent = 0;
522528
mysql_globals->default_socket = NULL;
523529
mysql_globals->default_host = NULL;

‎ext/mysql/php_mysql_structs.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,10 @@ ZEND_BEGIN_MODULE_GLOBALS(mysql)
127127
ZEND_END_MODULE_GLOBALS(mysql)
128128

129129
#ifdef ZTS
130-
# define MySG(v) TSRMG(mysql_globals_id, zend_mysql_globals *, v)
130+
# define MySG(v) ZEND_TSRMG(mysql_globals_id, zend_mysql_globals *, v)
131+
# ifdef COMPILE_DL_MYSQL
132+
ZEND_TSRMLS_CACHE_EXTERN;
133+
# endif
131134
#else
132135
# define MySG(v) (mysql_globals.v)
133136
#endif

‎ext/mysqli/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ if test "$PHP_MYSQLI" != "no"; then
7575
mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \
7676
mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \
7777
mysqli_exception.c mysqli_result_iterator.c $mysqli_extra_sources"
78-
PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared)
78+
PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
7979
PHP_SUBST(MYSQLI_SHARED_LIBADD)
8080
PHP_INSTALL_HEADERS([ext/mysqli/php_mysqli_structs.h])
8181

‎ext/mysqli/config.w32

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if (PHP_MYSQLI != "no") {
2323
"mysqli_warning.c";
2424

2525
if (PHP_MYSQLI == "yes" || PHP_MYSQLI == "mysqlnd") {
26-
EXTENSION("mysqli", mysqli_source);
26+
EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
2727
AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'Using MySQL native driver');
2828
AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
2929
ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true);
@@ -34,7 +34,7 @@ if (PHP_MYSQLI != "no") {
3434
CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI +
3535
"\\include;" + PHP_PHP_BUILD +
3636
"\\include\\mysql;" + PHP_MYSQLI)) {
37-
EXTENSION("mysqli", mysqli_source);
37+
EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
3838
AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
3939
MESSAGE("\tlibmysql build");
4040
PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h");

‎ext/mysqli/mysqli.c

+6
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,9 @@ PHP_INI_END()
537537
*/
538538
static PHP_GINIT_FUNCTION(mysqli)
539539
{
540+
#if defined(COMPILE_DL_MYSQLI) && defined(ZTS)
541+
ZEND_TSRMLS_CACHE_UPDATE;
542+
#endif
540543
mysqli_globals->num_links = 0;
541544
mysqli_globals->num_active_persistent = 0;
542545
mysqli_globals->num_inactive_persistent = 0;
@@ -1030,6 +1033,9 @@ zend_module_entry mysqli_module_entry = {
10301033
/* }}} */
10311034

10321035
#ifdef COMPILE_DL_MYSQLI
1036+
#ifdef ZTS
1037+
ZEND_TSRMLS_CACHE_DEFINE;
1038+
#endif
10331039
ZEND_GET_MODULE(mysqli)
10341040
#endif
10351041

‎ext/mysqli/php_mysqli_structs.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,10 @@ ZEND_END_MODULE_GLOBALS(mysqli)
344344

345345

346346
#ifdef ZTS
347-
#define MyG(v) TSRMG(mysqli_globals_id, zend_mysqli_globals *, v)
347+
#define MyG(v) ZEND_TSRMG(mysqli_globals_id, zend_mysqli_globals *, v)
348+
#ifdef COMPILE_DL_MYSQLI
349+
ZEND_TSRMLS_CACHE_EXTERN;
350+
#endif
348351
#else
349352
#define MyG(v) (mysqli_globals.v)
350353
#endif

‎ext/mysqlnd/config.w32

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if (PHP_MYSQLND != "no") {
2525
"mysqlnd_statistics.c " +
2626
"mysqlnd_wireprotocol.c " +
2727
"php_mysqlnd.c ";
28-
EXTENSION("mysqlnd", mysqlnd_source, false);
28+
EXTENSION("mysqlnd", mysqlnd_source, false, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
2929
if (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "mysqlnd", PHP_MYSQLND))) ||
3030
(PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "mysqlnd", PHP_MYSQLND)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
3131
{

‎ext/mysqlnd/config9.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
4141
fi
4242

4343
mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
44-
PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, $ext_shared)
44+
PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
4545
PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
4646
PHP_INSTALL_HEADERS([ext/mysqlnd/])
4747
fi

‎ext/mysqlnd/mysqlnd.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,10 @@ ZEND_END_MODULE_GLOBALS(mysqlnd)
288288
PHPAPI ZEND_EXTERN_MODULE_GLOBALS(mysqlnd)
289289

290290
#ifdef ZTS
291-
#define MYSQLND_G(v) TSRMG(mysqlnd_globals_id, zend_mysqlnd_globals *, v)
291+
#define MYSQLND_G(v) ZEND_TSRMG(mysqlnd_globals_id, zend_mysqlnd_globals *, v)
292+
#ifdef COMPILE_DL_MYSQLND
293+
ZEND_TSRMLS_CACHE_EXTERN;
294+
#endif
292295
#else
293296
#define MYSQLND_G(v) (mysqlnd_globals.v)
294297
#endif

‎ext/mysqlnd/php_mysqlnd.c

+6
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,9 @@ PHPAPI ZEND_DECLARE_MODULE_GLOBALS(mysqlnd)
179179
*/
180180
static PHP_GINIT_FUNCTION(mysqlnd)
181181
{
182+
#if defined(COMPILE_DL_MYSQLND) && defined(ZTS)
183+
ZEND_TSRMLS_CACHE_UPDATE;
184+
#endif
182185
mysqlnd_globals->collect_statistics = TRUE;
183186
mysqlnd_globals->collect_memory_statistics = FALSE;
184187
mysqlnd_globals->debug = NULL; /* The actual string */
@@ -357,6 +360,9 @@ zend_module_entry mysqlnd_module_entry = {
357360

358361
/* {{{ COMPILE_DL_MYSQLND */
359362
#ifdef COMPILE_DL_MYSQLND
363+
#ifdef ZTS
364+
ZEND_TSRMLS_CACHE_DEFINE;
365+
#endif
360366
ZEND_GET_MODULE(mysqlnd)
361367
#endif
362368
/* }}} */

‎ext/zlib/zlib.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ PHP_ZLIB_DECODE_FUNC(gzuncompress, PHP_ZLIB_ENCODING_DEFLATE);
724724

725725
#ifdef COMPILE_DL_ZLIB
726726
#ifdef ZTS
727-
TSRMLS_CACHE_DEFINE;
727+
ZEND_TSRMLS_CACHE_DEFINE;
728728
#endif
729729
ZEND_GET_MODULE(php_zlib)
730730
#endif
@@ -1011,7 +1011,7 @@ static PHP_MINFO_FUNCTION(zlib)
10111011
static PHP_GINIT_FUNCTION(zlib)
10121012
{
10131013
#if defined(COMPILE_DL_ZLIB) && defined(ZTS)
1014-
TSRMLS_CACHE_UPDATE;
1014+
ZEND_TSRMLS_CACHE_UPDATE;
10151015
#endif
10161016
zlib_globals->ob_gzhandler = NULL;
10171017
zlib_globals->handler_registered = 0;

0 commit comments

Comments
 (0)