RE: [ZEND-ENGINE-CVS] cvs: ZendEngine2 / zend_API.c zend_API.h zend_modules.h php-src NEWS

I am going to commit the same patch into PHP_5_2 on this week. Dmitry. > -----Original Message----- > From: Dmitry Stogov [mailto:dmitry@php.net] > Sent: Tuesday, June 13, 2006 5:12 PM > To: zend-engine-cvs@lists.php.net > Subject: [ZEND-ENGINE-CVS] cvs: ZendEngine2 / zend_API.c > zend_API.h zend_modules.h php-src NEWS > > > dmitry Tue Jun 13 13:11:43 2006 UTC > > Modified files: > /php-src NEWS > /ZendEngine2 zend_API.c zend_API.h zend_modules.h > Log: > Added automatic module globals management. > > > > http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2118&r2=1.211 > 9&diff_format=u > Index: php-src/NEWS > diff -u php-src/NEWS:1.2118 php-src/NEWS:1.2119 > --- php-src/NEWS:1.2118 Tue Jun 6 20:08:58 2006 > +++ php-src/NEWS Tue Jun 13 13:11:42 2006 > @@ -33,6 +33,7 @@ > . Added curl_setopt_array() which allows setting of > multiple cURL options. > . Added CURLINFO_HEADER_OUT constant to facilitate request > retrieval. > > +- Added automatic module globals management. (Dmitry) > - Added "jump label" operator (limited "goto"). (Dmitry, Sara) > - Added E_STRICT to E_ALL. (Dmitry) > - Added gmp_nextprime() function. (Tony, patch by ants dot > aasma at gmail dot com) > http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_API.c?r1=1.370 > &r2=1.371&diff_format=u > Index: ZendEngine2/zend_API.c > diff -u ZendEngine2/zend_API.c:1.370 ZendEngine2/zend_API.c:1.371 > --- ZendEngine2/zend_API.c:1.370 Wed Jun 7 09:20:02 2006 > +++ ZendEngine2/zend_API.c Tue Jun 13 13:11:42 2006 > @@ -18,7 +18,7 @@ > > +------------------------------------------------------------- > ---------+ > */ > > -/* $Id: zend_API.c,v 1.370 2006/06/07 09:20:02 helly Exp $ */ > +/* $Id: zend_API.c,v 1.371 2006/06/13 13:11:42 dmitry Exp $ */ > > #include "zend.h" > #include "zend_execute.h" > @@ -1873,6 +1873,17 @@ > } > } > > + /* Initialize module globals */ > + if (module->globals_size) { > +#ifdef ZTS > + ts_allocate_id(module->globals_id_ptr, > module->globals_size, > +(ts_allocate_ctor) module->globals_ctor, (ts_allocate_dtor) > module->globals_dtor); #else > + if (module->globals_ctor) { > + > module->globals_ctor(module->globals_ptr TSRMLS_CC); > + } > +#endif > + } > + > if (module->module_startup_func) { > EG(current_module) = module; > if (module->module_startup_func(module->type, > module->module_number TSRMLS_CC)==FAILURE) { @@ -2323,6 > +2334,19 @@ #endif > module->module_shutdown_func(module->type, > module->module_number TSRMLS_CC); > } > + > + > + /* Deinitilaise module globals */ > + if (module->globals_size) { > +#ifdef ZTS > + ts_free_id(*module->globals_id_ptr); > +#else > + if (module->globals_dtor) { > + > module->globals_dtor(module->globals_ptr TSRMLS_CC); > + } > +#endif > + } > + > module->module_started=0; > if (module->functions) { > zend_unregister_functions(module->functions, > -1, NULL TSRMLS_CC); > http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_API.h?r1=1.246 > &r2=1.247&diff_format=u > Index: ZendEngine2/zend_API.h > diff -u ZendEngine2/zend_API.h:1.246 ZendEngine2/zend_API.h:1.247 > --- ZendEngine2/zend_API.h:1.246 Sat May 27 19:40:06 2006 > +++ ZendEngine2/zend_API.h Tue Jun 13 13:11:42 2006 > @@ -18,7 +18,7 @@ > > +------------------------------------------------------------- > ---------+ > */ > > -/* $Id: zend_API.h,v 1.246 2006/05/27 19:40:06 helly Exp $ */ > +/* $Id: zend_API.h,v 1.247 2006/06/13 13:11:42 dmitry Exp $ */ > > #ifndef ZEND_API_H > #define ZEND_API_H > @@ -79,6 +79,8 @@ > #define ZEND_MODULE_DEACTIVATE_N(module) zm_deactivate_##module > #define ZEND_MODULE_POST_ZEND_DEACTIVATE_N(module) > zm_post_zend_deactivate_##module > #define ZEND_MODULE_INFO_N(module) zm_info_##module > +#define ZEND_MODULE_GLOBALS_CTOR_N(module) zm_globals_ctor_##module > +#define ZEND_MODULE_GLOBALS_DTOR_N(module) zm_globals_dtor_##module > > /* Declaration macros */ > #define ZEND_MODULE_STARTUP_D(module) int > ZEND_MODULE_STARTUP_N(module)(INIT_FUNC_ARGS) > @@ -87,6 +89,8 @@ > #define ZEND_MODULE_DEACTIVATE_D(module) int > ZEND_MODULE_DEACTIVATE_N(module)(SHUTDOWN_FUNC_ARGS) > #define ZEND_MODULE_POST_ZEND_DEACTIVATE_D(module) int > ZEND_MODULE_POST_ZEND_DEACTIVATE_N(module)(void) > #define ZEND_MODULE_INFO_D(module) void > ZEND_MODULE_INFO_N(module)(ZEND_MODULE_INFO_FUNC_ARGS) > +#define ZEND_MODULE_GLOBALS_CTOR_D(module) void > +ZEND_MODULE_GLOBALS_CTOR_N(module)(zend_##module##_globals > +*module##_globals TSRMLS_DC) #define > ZEND_MODULE_GLOBALS_DTOR_D(module) > +void ZEND_MODULE_GLOBALS_DTOR_N(module)(zend_##module##_globals > +*module##_globals TSRMLS_DC) > > #define ZEND_GET_MODULE(name) \ > BEGIN_EXTERN_C()\ > @@ -1034,12 +1038,16 @@ > #define ZEND_RINIT ZEND_MODULE_ACTIVATE_N > #define ZEND_RSHUTDOWN ZEND_MODULE_DEACTIVATE_N > #define ZEND_MINFO ZEND_MODULE_INFO_N > +#define ZEND_GINIT(module) ((void (*)(void* > TSRMLS_DC))(ZEND_MODULE_GLOBALS_CTOR_N(module))) > +#define ZEND_GSHUTDOWN(module) ((void (*)(void* > TSRMLS_DC))(ZEND_MODULE_GLOBALS_DTOR_N(module))) > > #define ZEND_MINIT_FUNCTION ZEND_MODULE_STARTUP_D > #define ZEND_MSHUTDOWN_FUNCTION ZEND_MODULE_SHUTDOWN_D > #define ZEND_RINIT_FUNCTION ZEND_MODULE_ACTIVATE_D > #define ZEND_RSHUTDOWN_FUNCTION ZEND_MODULE_DEACTIVATE_D > #define ZEND_MINFO_FUNCTION ZEND_MODULE_INFO_D > +#define ZEND_GINIT_FUNCTION > ZEND_MODULE_GLOBALS_CTOR_D > +#define ZEND_GSHUTDOWN_FUNCTION > ZEND_MODULE_GLOBALS_DTOR_D > > END_EXTERN_C() > > http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_modules.h?r1=1 > .72&r2=1.73&diff_format=u > Index: ZendEngine2/zend_modules.h > diff -u ZendEngine2/zend_modules.h:1.72 > ZendEngine2/zend_modules.h:1.73 > --- ZendEngine2/zend_modules.h:1.72 Thu Apr 6 21:16:28 2006 > +++ ZendEngine2/zend_modules.h Tue Jun 13 13:11:42 2006 > @@ -17,7 +17,7 @@ > > +------------------------------------------------------------- > ---------+ > */ > > -/* $Id: zend_modules.h,v 1.72 2006/04/06 21:16:28 andrei Exp $ */ > +/* $Id: zend_modules.h,v 1.73 2006/06/13 13:11:42 dmitry Exp $ */ > > #ifndef MODULES_H > #define MODULES_H > @@ -39,7 +39,7 @@ > extern struct _zend_arg_info fifth_arg_force_ref[6]; > extern struct _zend_arg_info all_args_by_ref[1]; > > -#define ZEND_MODULE_API_NO 20050922 > +#define ZEND_MODULE_API_NO 20060613 > #ifdef ZTS > #define USING_ZTS 1 > #else > @@ -52,10 +52,18 @@ > #define ZE2_STANDARD_MODULE_HEADER \ > STANDARD_MODULE_HEADER_EX, ini_entries, NULL > > -#define STANDARD_MODULE_PROPERTIES_EX 0, 0, 0, NULL, 0 > +#define STANDARD_MODULE_PROPERTIES_EX 0, 0, NULL, 0 > + > +#define NO_MODULE_GLOBASLS 0, NULL, NULL, NULL > + > +#ifdef ZTS > +# define ZEND_MODULE_GLOBALS(module_name) > +sizeof(zend_##module_name##_globals), > &module_name##_globals_id #else # > +define ZEND_MODULE_GLOBALS(module_name) > +sizeof(zend_##module_name##_globals), &module_name##_globals #endif > > #define STANDARD_MODULE_PROPERTIES \ > - NULL, STANDARD_MODULE_PROPERTIES_EX > + NO_MODULE_GLOBASLS, NULL, STANDARD_MODULE_PROPERTIES_EX > > #define NO_VERSION_YET NULL > > @@ -81,8 +89,15 @@ > int (*request_shutdown_func)(SHUTDOWN_FUNC_ARGS); > void (*info_func)(ZEND_MODULE_INFO_FUNC_ARGS); > char *version; > + size_t globals_size; > +#ifdef ZTS > + ts_rsrc_id* globals_id_ptr; > +#else > + void* globals_ptr; > +#endif > + void (*globals_ctor)(void *global TSRMLS_DC); > + void (*globals_dtor)(void *global TSRMLS_DC); > int (*post_deactivate_func)(void); > - int globals_id; > int module_started; > unsigned char type; > void *handle; > > -- > Zend Engine CVS Mailing List (http://cvs.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > >

http://cvs.php.net/viewcvs.cgi/php-src/main/php.h?r1=1.231&r2=1.232&diff_format=u Index: php-src/main/php.h diff -u php-src/main/php.h:1.231 php-src/main/php.h:1.232 --- php-src/main/php.h:1.231 Fri Jun 2 19:51:42 2006 +++ php-src/main/php.h Tue Jun 13 13:12:18 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.231 2006/06/02 19:51:42 mike Exp $ */ +/* $Id: php.h,v 1.232 2006/06/13 13:12:18 dmitry Exp $ */ #ifndef PHP_H #define PHP_H @@ -363,13 +363,18 @@ #define PHP_RINIT ZEND_MODULE_ACTIVATE_N #define PHP_RSHUTDOWN ZEND_MODULE_DEACTIVATE_N #define PHP_MINFO ZEND_MODULE_INFO_N +#define PHP_GINIT ZEND_GINIT +#define PHP_GSHUTDOWN ZEND_GSHUTDOWN #define PHP_MINIT_FUNCTION ZEND_MODULE_STARTUP_D #define PHP_MSHUTDOWN_FUNCTION ZEND_MODULE_SHUTDOWN_D #define PHP_RINIT_FUNCTION ZEND_MODULE_ACTIVATE_D #define PHP_RSHUTDOWN_FUNCTION ZEND_MODULE_DEACTIVATE_D #define PHP_MINFO_FUNCTION ZEND_MODULE_INFO_D +#define PHP_GINIT_FUNCTION ZEND_GINIT_FUNCTION +#define PHP_GSHUTDOWN_FUNCTION ZEND_GSHUTDOWN_FUNCTION +#define PHP_MODULE_GLOBALS ZEND_MODULE_GLOBALS /* Output support */ #include "main/php_output.h" http://cvs.php.net/viewcvs.cgi/php-src/ext/bcmath/bcmath.c?r1=1.65&r2=1.66&diff_format=u Index: php-src/ext/bcmath/bcmath.c diff -u php-src/ext/bcmath/bcmath.c:1.65 php-src/ext/bcmath/bcmath.c:1.66 --- php-src/ext/bcmath/bcmath.c:1.65 Sat Jun 10 22:59:39 2006 +++ php-src/ext/bcmath/bcmath.c Tue Jun 13 13:12:18 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bcmath.c,v 1.65 2006/06/10 22:59:39 bjori Exp $ */ +/* $Id: bcmath.c,v 1.66 2006/06/13 13:12:18 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -32,6 +32,7 @@ #include "libbcmath/src/bcmath.h" ZEND_DECLARE_MODULE_GLOBALS(bcmath); +static PHP_GINIT_FUNCTION(bcmath); /* {{{ arginfo */ static @@ -127,7 +128,11 @@ PHP_RSHUTDOWN(bcmath), PHP_MINFO(bcmath), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(bcmath), + PHP_GINIT(bcmath), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; #ifdef COMPILE_DL_BCMATH @@ -140,9 +145,9 @@ PHP_INI_END() /* }}} */ -/* {{{ php_bcmath_init_globals +/* {{{ PHP_GINIT_FUNCTION */ -static void php_bcmath_init_globals(zend_bcmath_globals *bcmath_globals) +static PHP_GINIT_FUNCTION(bcmath) { bcmath_globals->bc_precision = 0; } @@ -152,8 +157,6 @@ */ PHP_MINIT_FUNCTION(bcmath) { - ZEND_INIT_MODULE_GLOBALS(bcmath, php_bcmath_init_globals, NULL); - REGISTER_INI_ENTRIES(); return SUCCESS; http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_extension.c?r1=1.20&r2=1.21&diff_format=u Index: php-src/ext/com_dotnet/com_extension.c diff -u php-src/ext/com_dotnet/com_extension.c:1.20 php-src/ext/com_dotnet/com_extension.c:1.21 --- php-src/ext/com_dotnet/com_extension.c:1.20 Sun Jan 1 13:09:48 2006 +++ php-src/ext/com_dotnet/com_extension.c Tue Jun 13 13:12:18 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_extension.c,v 1.20 2006/01/01 13:09:48 sniper Exp $ */ +/* $Id: com_extension.c,v 1.21 2006/06/13 13:12:18 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -30,6 +30,8 @@ #include "Zend/zend_exceptions.h" ZEND_DECLARE_MODULE_GLOBALS(com_dotnet) +static PHP_GINIT_FUNCTION(com_dotnet); + TsHashTable php_com_typelibraries; zend_class_entry @@ -86,7 +88,11 @@ PHP_RSHUTDOWN(com_dotnet), PHP_MINFO(com_dotnet), "0.1", - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(com_dotnet), + PHP_GINIT(com_dotnet), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ @@ -170,9 +176,9 @@ PHP_INI_END() /* }}} */ -/* {{{ php_com_dotnet_init_globals +/* {{{ PHP_GINIT_FUNCTION */ -static void php_com_dotnet_init_globals(zend_com_dotnet_globals *com_dotnet_globals) +static PHP_GINIT_FUNCTION(com_dotnet) { memset(com_dotnet_globals, 0, sizeof(*com_dotnet_globals)); com_dotnet_globals->code_page = CP_ACP; @@ -185,7 +191,6 @@ { zend_class_entry ce, *tmp; - ZEND_INIT_MODULE_GLOBALS(com_dotnet, php_com_dotnet_init_globals, NULL); REGISTER_INI_ENTRIES(); php_com_wrapper_minit(INIT_FUNC_ARGS_PASSTHRU); http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.c?r1=1.98&r2=1.99&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.98 php-src/ext/date/php_date.c:1.99 --- php-src/ext/date/php_date.c:1.98 Sun Jun 11 20:11:52 2006 +++ php-src/ext/date/php_date.c Tue Jun 13 13:12:18 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_date.c,v 1.98 2006/06/11 20:11:52 bjori Exp $ */ +/* $Id: php_date.c,v 1.99 2006/06/13 13:12:18 dmitry Exp $ */ #include "php.h" #include "php_streams.h" @@ -232,6 +232,7 @@ /* }}} */ ZEND_DECLARE_MODULE_GLOBALS(date) +static PHP_GINIT_FUNCTION(date); /* True global */ timelib_tzdb *php_date_global_timezone_db; @@ -311,13 +312,17 @@ PHP_RSHUTDOWN(date), /* request shutdown */ PHP_MINFO(date), /* extension info */ PHP_VERSION, /* extension version */ - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(date), /* globals descriptor */ + PHP_GINIT(date), /* globals ctor */ + NULL, /* globals dtor */ + NULL, /* post deactivate */ + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ -/* {{{ php_date_init_globals */ -static void php_date_init_globals(zend_date_globals *date_globals) +/* {{{ PHP_GINIT_FUNCTION */ +static PHP_GINIT_FUNCTION(date) { date_globals->default_timezone = NULL; date_globals->timezone = NULL; @@ -457,7 +462,6 @@ /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(date) { - ZEND_INIT_MODULE_GLOBALS(date, php_date_init_globals, NULL); REGISTER_INI_ENTRIES(); date_register_classes(TSRMLS_C); http://cvs.php.net/viewcvs.cgi/php-src/ext/dba/dba.c?r1=1.119&r2=1.120&diff_format=u Index: php-src/ext/dba/dba.c diff -u php-src/ext/dba/dba.c:1.119 php-src/ext/dba/dba.c:1.120 --- php-src/ext/dba/dba.c:1.119 Sat Jun 10 22:59:40 2006 +++ php-src/ext/dba/dba.c Tue Jun 13 13:12:18 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.119 2006/06/10 22:59:40 bjori Exp $ */ +/* $Id: dba.c,v 1.120 2006/06/13 13:12:18 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -168,6 +168,21 @@ PHP_MSHUTDOWN_FUNCTION(dba); PHP_MINFO_FUNCTION(dba); +ZEND_BEGIN_MODULE_GLOBALS(dba) + char *default_handler; + dba_handler *default_hptr; +ZEND_END_MODULE_GLOBALS(dba) + +ZEND_DECLARE_MODULE_GLOBALS(dba) + +#ifdef ZTS +#define DBA_G(v) TSRMG(dba_globals_id, zend_dba_globals *, v) +#else +#define DBA_G(v) (dba_globals.v) +#endif + +static PHP_GINIT_FUNCTION(dba); + zend_module_entry dba_module_entry = { STANDARD_MODULE_HEADER, "dba", @@ -178,7 +193,11 @@ NULL, PHP_MINFO(dba), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(dba), + PHP_GINIT(dba), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; #ifdef COMPILE_DL_DBA @@ -378,19 +397,6 @@ #endif /* cdb/cdb_make and ini are no option here */ -ZEND_BEGIN_MODULE_GLOBALS(dba) - char *default_handler; - dba_handler *default_hptr; -ZEND_END_MODULE_GLOBALS(dba) - -ZEND_DECLARE_MODULE_GLOBALS(dba) - -#ifdef ZTS -#define DBA_G(v) TSRMG(dba_globals_id, zend_dba_globals *, v) -#else -#define DBA_G(v) (dba_globals.v) -#endif - static int le_db; static int le_pdb; /* }}} */ @@ -499,9 +505,9 @@ PHP_INI_END() /* }}} */ -/* {{{ php_dba_init_globals +/* {{{ PHP_GINIT_FUNCTION */ -static void php_dba_init_globals(zend_dba_globals *dba_globals) +static PHP_GINIT_FUNCTION(dba) { dba_globals->default_handler = ""; dba_globals->default_hptr = NULL; @@ -512,7 +518,6 @@ */ PHP_MINIT_FUNCTION(dba) { - ZEND_INIT_MODULE_GLOBALS(dba, php_dba_init_globals, NULL); REGISTER_INI_ENTRIES(); le_db = zend_register_list_destructors_ex(dba_close_rsrc, NULL, "dba", module_number); le_pdb = zend_register_list_destructors_ex(dba_close_pe_rsrc, dba_close_rsrc, "dba persistent", module_number); http://cvs.php.net/viewcvs.cgi/php-src/ext/exif/exif.c?r1=1.181&r2=1.182&diff_format=u Index: php-src/ext/exif/exif.c diff -u php-src/ext/exif/exif.c:1.181 php-src/ext/exif/exif.c:1.182 --- php-src/ext/exif/exif.c:1.181 Sat Jun 10 22:59:40 2006 +++ php-src/ext/exif/exif.c Tue Jun 13 13:12:18 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.181 2006/06/10 22:59:40 bjori Exp $ */ +/* $Id: exif.c,v 1.182 2006/06/13 13:12:18 dmitry Exp $ */ /* ToDos * @@ -139,7 +139,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.4 $Id: exif.c,v 1.181 2006/06/10 22:59:40 bjori Exp $" +#define EXIF_VERSION "1.4 $Id: exif.c,v 1.182 2006/06/13 13:12:18 dmitry Exp $" /* {{{ PHP_MINFO_FUNCTION */ @@ -206,9 +206,9 @@ PHP_INI_END() /* }}} */ -/* {{{ php_extname_init_globals +/* {{{ PHP_GINIT_FUNCTION */ -static void php_exif_init_globals(zend_exif_globals *exif_globals) +static PHP_GINIT_FUNCTION(exif) { exif_globals->encode_unicode = NULL; exif_globals->decode_unicode_be = NULL; @@ -223,7 +223,6 @@ Get the size of an image as 4-element array */ PHP_MINIT_FUNCTION(exif) { - ZEND_INIT_MODULE_GLOBALS(exif, php_exif_init_globals, NULL); REGISTER_INI_ENTRIES(); REGISTER_LONG_CONSTANT("EXIF_USE_MBSTRING", EXIF_USE_MBSTRING, CONST_CS | CONST_PERSISTENT); return SUCCESS; @@ -254,7 +253,15 @@ #if ZEND_MODULE_API_NO >= 20010901 EXIF_VERSION, #endif +#if ZEND_MODULE_API_NO >= 20060613 + PHP_MODULE_GLOBALS(exif), + PHP_GINIT(exif), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX +#else STANDARD_MODULE_PROPERTIES +#endif }; /* }}} */ http://cvs.php.net/viewcvs.cgi/php-src/ext/fbsql/php_fbsql.c?r1=1.117&r2=1.118&diff_format=u Index: php-src/ext/fbsql/php_fbsql.c diff -u php-src/ext/fbsql/php_fbsql.c:1.117 php-src/ext/fbsql/php_fbsql.c:1.118 --- php-src/ext/fbsql/php_fbsql.c:1.117 Sun Jan 1 13:09:49 2006 +++ php-src/ext/fbsql/php_fbsql.c Tue Jun 13 13:12:18 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.117 2006/01/01 13:09:49 sniper Exp $ */ +/* $Id: php_fbsql.c,v 1.118 2006/06/13 13:12:18 dmitry Exp $ */ /* TODO: * @@ -165,6 +165,9 @@ #define DIGEST_BUFFER_SIZE 17 /* fbcDigestPassword() expects a preallocated buffer for 16 bytes plus termination */ +ZEND_DECLARE_MODULE_GLOBALS(fbsql) +static PHP_GINIT_FUNCTION(fbsql); + int mdOk(PHPFBLink* link, FBCMetaData* md, char* sql); char *DigestPassword(char *user, char *password) { @@ -267,11 +270,13 @@ PHP_RSHUTDOWN(fbsql), PHP_MINFO(fbsql), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(fbsql), + PHP_GINIT(fbsql), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; -ZEND_DECLARE_MODULE_GLOBALS(fbsql) - #ifdef COMPILE_DL_FBSQL ZEND_GET_MODULE(fbsql) #endif @@ -392,7 +397,7 @@ PHP_INI_END() /* }}} */ -static void php_fbsql_init_globals(zend_fbsql_globals *fbsql_globals) +static PHP_GINIT_FUNCTION(fbsql) { fbsql_globals->persistentCount = 0; @@ -410,8 +415,6 @@ PHP_MINIT_FUNCTION(fbsql) { - ZEND_INIT_MODULE_GLOBALS(fbsql, php_fbsql_init_globals, NULL); - REGISTER_INI_ENTRIES(); fbcInitialize(); http://cvs.php.net/viewcvs.cgi/php-src/ext/fdf/fdf.c?r1=1.93&r2=1.94&diff_format=u Index: php-src/ext/fdf/fdf.c diff -u php-src/ext/fdf/fdf.c:1.93 php-src/ext/fdf/fdf.c:1.94 --- php-src/ext/fdf/fdf.c:1.93 Sun Feb 19 00:55:19 2006 +++ php-src/ext/fdf/fdf.c Tue Jun 13 13:12:18 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.93 2006/02/19 00:55:19 andi Exp $ */ +/* $Id: fdf.c,v 1.94 2006/06/13 13:12:18 dmitry Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -91,6 +91,9 @@ }; /* }}} */ +ZEND_DECLARE_MODULE_GLOBALS(fdf) +static PHP_GINIT_FUNCTION(fdf); + zend_module_entry fdf_module_entry = { STANDARD_MODULE_HEADER, "fdf", @@ -101,15 +104,17 @@ NULL, PHP_MINFO(fdf), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(fdf), + PHP_GINIT(fdf), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; #ifdef COMPILE_DL_FDF ZEND_GET_MODULE(fdf) #endif -ZEND_DECLARE_MODULE_GLOBALS(fdf) - #define FDF_SUCCESS do { FDF_G(error)=FDFErcOK; RETURN_TRUE;} while(0) #define FDF_FAILURE(err) do { FDF_G(error)=err; RETURN_FALSE;} while(0) @@ -129,7 +134,7 @@ fdf_post_handler }; -static void php_fdf_init_globals(zend_fdf_globals *fdf_globals) +static PHP_GINIT_FUNCTION(fdf) { memset(fdf_globals, 0, sizeof(*fdf_globals)); } @@ -140,8 +145,6 @@ */ PHP_MINIT_FUNCTION(fdf) { - ZEND_INIT_MODULE_GLOBALS(fdf, php_fdf_init_globals, NULL); - le_fdf = zend_register_list_destructors_ex(phpi_FDFClose, NULL, "fdf", module_number); /* add handler for Acrobat FDF form post requests */ http://cvs.php.net/viewcvs.cgi/php-src/ext/gmp/gmp.c?r1=1.52&r2=1.53&diff_format=u Index: php-src/ext/gmp/gmp.c diff -u php-src/ext/gmp/gmp.c:1.52 php-src/ext/gmp/gmp.c:1.53 --- php-src/ext/gmp/gmp.c:1.52 Mon Apr 3 17:46:12 2006 +++ php-src/ext/gmp/gmp.c Tue Jun 13 13:12:18 2006 @@ -37,6 +37,9 @@ /* True global resources - no need for thread safety here */ static int le_gmp; +ZEND_DECLARE_MODULE_GLOBALS(gmp) +static ZEND_GINIT_FUNCTION(gmp); + /* {{{ gmp_functions[] */ zend_function_entry gmp_functions[] = { @@ -96,12 +99,14 @@ ZEND_MODULE_DEACTIVATE_N(gmp), ZEND_MODULE_INFO_N(gmp), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + ZEND_MODULE_GLOBALS(gmp), + ZEND_GINIT(gmp), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ -ZEND_DECLARE_MODULE_GLOBALS(gmp) - #ifdef COMPILE_DL_GMP ZEND_GET_MODULE(gmp) # ifdef PHP_WIN32 @@ -141,9 +146,9 @@ } /* }}} */ -/* {{{ php_gmp_init_globals +/* {{{ ZEND_GINIT_FUNCTION */ -static void php_gmp_init_globals(zend_gmp_globals *gmp_globals) +static ZEND_GINIT_FUNCTION(gmp) { gmp_globals->rand_initialized = 0; } @@ -153,8 +158,6 @@ */ ZEND_MODULE_STARTUP_D(gmp) { - ZEND_INIT_MODULE_GLOBALS(gmp, php_gmp_init_globals, NULL); - le_gmp = zend_register_list_destructors_ex(_php_gmpnum_free, NULL, GMP_RESOURCE_NAME, module_number); REGISTER_LONG_CONSTANT("GMP_ROUND_ZERO", GMP_ROUND_ZERO, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("GMP_ROUND_PLUSINF", GMP_ROUND_PLUSINF, CONST_CS | CONST_PERSISTENT); http://cvs.php.net/viewcvs.cgi/php-src/ext/iconv/iconv.c?r1=1.134&r2=1.135&diff_format=u Index: php-src/ext/iconv/iconv.c diff -u php-src/ext/iconv/iconv.c:1.134 php-src/ext/iconv/iconv.c:1.135 --- php-src/ext/iconv/iconv.c:1.134 Thu Apr 27 03:53:01 2006 +++ php-src/ext/iconv/iconv.c Tue Jun 13 13:12:18 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iconv.c,v 1.134 2006/04/27 03:53:01 moriyoshi Exp $ */ +/* $Id: iconv.c,v 1.135 2006/06/13 13:12:18 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -80,6 +80,9 @@ }; /* }}} */ +ZEND_DECLARE_MODULE_GLOBALS(iconv) +static PHP_GINIT_FUNCTION(iconv); + /* {{{ iconv_module_entry */ zend_module_entry iconv_module_entry = { @@ -92,12 +95,14 @@ NULL, PHP_MINFO(miconv), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(iconv), + PHP_GINIT(iconv), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ -ZEND_DECLARE_MODULE_GLOBALS(iconv) - #ifdef COMPILE_DL_ICONV ZEND_GET_MODULE(iconv) #endif @@ -151,8 +156,8 @@ PHP_INI_END() /* }}} */ -/* {{{ php_iconv_init_globals */ -static void php_iconv_init_globals(zend_iconv_globals *iconv_globals) +/* {{{ PHP_GINIT_FUNCTION */ +static PHP_GINIT_FUNCTION(iconv) { iconv_globals->input_encoding = NULL; iconv_globals->output_encoding = NULL; @@ -165,7 +170,6 @@ { char *version = "unknown"; - ZEND_INIT_MODULE_GLOBALS(iconv, php_iconv_init_globals, NULL); REGISTER_INI_ENTRIES(); #if HAVE_LIBICONV http://cvs.php.net/viewcvs.cgi/php-src/ext/imap/php_imap.c?r1=1.216&r2=1.217&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.216 php-src/ext/imap/php_imap.c:1.217 --- php-src/ext/imap/php_imap.c:1.216 Sun Feb 19 04:29:41 2006 +++ php-src/ext/imap/php_imap.c Tue Jun 13 13:12:18 2006 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.216 2006/02/19 04:29:41 andi Exp $ */ +/* $Id: php_imap.c,v 1.217 2006/06/13 13:12:18 dmitry Exp $ */ #define IMAP41 @@ -80,6 +80,8 @@ void fs_give(void **block); void *fs_get(size_t size); +ZEND_DECLARE_MODULE_GLOBALS(imap) +static PHP_GINIT_FUNCTION(imap); /* {{{ imap_functions[] */ @@ -175,12 +177,14 @@ PHP_RSHUTDOWN(imap), PHP_MINFO(imap), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(imap), + PHP_GINIT(imap), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ -ZEND_DECLARE_MODULE_GLOBALS(imap) - #ifdef COMPILE_DL_IMAP ZEND_GET_MODULE(imap) #endif @@ -397,9 +401,9 @@ #endif -/* {{{ php_imap_init_globals +/* {{{ PHP_GINIT_FUNCTION */ -static void php_imap_init_globals(zend_imap_globals *imap_globals) +static PHP_GINIT_FUNCTION(imap) { imap_globals->imap_user = NIL; imap_globals->imap_password = NIL; @@ -433,8 +437,6 @@ { unsigned long sa_all = SA_MESSAGES | SA_RECENT | SA_UNSEEN | SA_UIDNEXT | SA_UIDVALIDITY; - ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL) - #ifndef PHP_WIN32 mail_link(&unixdriver); /* link in the unix driver */ mail_link(&mhdriver); /* link in the mh driver */ http://cvs.php.net/viewcvs.cgi/php-src/ext/interbase/interbase.c?r1=1.229&r2=1.230&diff_format=u Index: php-src/ext/interbase/interbase.c diff -u php-src/ext/interbase/interbase.c:1.229 php-src/ext/interbase/interbase.c:1.230 --- php-src/ext/interbase/interbase.c:1.229 Sun Jan 1 13:09:50 2006 +++ php-src/ext/interbase/interbase.c Tue Jun 13 13:12:18 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.229 2006/01/01 13:09:50 sniper Exp $ */ +/* $Id: interbase.c,v 1.230 2006/06/13 13:12:18 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -43,6 +43,9 @@ #define COMMIT 1 #define RETAIN 2 +ZEND_DECLARE_MODULE_GLOBALS(ibase) +static PHP_GINIT_FUNCTION(ibase); + /* {{{ extension definition structures */ zend_function_entry ibase_functions[] = { PHP_FE(ibase_connect, NULL) @@ -178,7 +181,11 @@ PHP_RSHUTDOWN(ibase), PHP_MINFO(ibase), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(ibase), + PHP_GINIT(ibase), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; #ifdef COMPILE_DL_INTERBASE @@ -188,8 +195,6 @@ /* True globals, no need for thread safety */ int le_link, le_plink, le_trans; -ZEND_DECLARE_MODULE_GLOBALS(ibase) - /* }}} */ /* error handling ---------------------------- */ @@ -448,7 +453,7 @@ PHP_INI_ENTRY("ibase.timeformat", IB_DEF_TIME_FMT, PHP_INI_ALL, NULL) PHP_INI_END() -static void php_ibase_init_globals(zend_ibase_globals *ibase_globals) +static PHP_GINIT_FUNCTION(ibase) { ibase_globals->num_persistent = ibase_globals->num_links = 0; ibase_globals->sql_code = *ibase_globals->errmsg = 0; @@ -457,8 +462,6 @@ PHP_MINIT_FUNCTION(ibase) { - ZEND_INIT_MODULE_GLOBALS(ibase, php_ibase_init_globals, NULL); - REGISTER_INI_ENTRIES(); le_link = zend_register_list_destructors_ex(_php_ibase_close_link, NULL, LE_LINK, module_number); http://cvs.php.net/viewcvs.cgi/php-src/ext/ldap/ldap.c?r1=1.165&r2=1.166&diff_format=u Index: php-src/ext/ldap/ldap.c diff -u php-src/ext/ldap/ldap.c:1.165 php-src/ext/ldap/ldap.c:1.166 --- php-src/ext/ldap/ldap.c:1.165 Sun Jan 1 13:09:51 2006 +++ php-src/ext/ldap/ldap.c Tue Jun 13 13:12:18 2006 @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.165 2006/01/01 13:09:51 sniper Exp $ */ +/* $Id: ldap.c,v 1.166 2006/06/13 13:12:18 dmitry Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -78,6 +78,7 @@ } ldap_resultentry; ZEND_DECLARE_MODULE_GLOBALS(ldap) +static PHP_GINIT_FUNCTION(ldap); static ZEND_BEGIN_ARG_INFO(arg3to6of6_force_ref, 0) @@ -177,7 +178,11 @@ NULL, PHP_MINFO(ldap), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(ldap), + PHP_GINIT(ldap), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; #ifdef COMPILE_DL_LDAP @@ -222,9 +227,9 @@ PHP_INI_END() /* }}} */ -/* {{{ php_ldap_init_globals +/* {{{ PHP_GINIT_FUNCTION */ -static void php_ldap_init_globals(zend_ldap_globals *ldap_globals) +static PHP_GINIT_FUNCTION(ldap) { ldap_globals->num_links = 0; } @@ -234,8 +239,6 @@ */ PHP_MINIT_FUNCTION(ldap) { - ZEND_INIT_MODULE_GLOBALS(ldap, php_ldap_init_globals, NULL); - REGISTER_INI_ENTRIES(); /* Constants to be used with deref-parameter in php_ldap_do_search() */ @@ -314,7 +317,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled"); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.165 2006/01/01 13:09:51 sniper Exp $"); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.166 2006/06/13 13:12:18 dmitry Exp $"); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links)); http://cvs.php.net/viewcvs.cgi/php-src/ext/libxml/libxml.c?r1=1.45&r2=1.46&diff_format=u Index: php-src/ext/libxml/libxml.c diff -u php-src/ext/libxml/libxml.c:1.45 php-src/ext/libxml/libxml.c:1.46 --- php-src/ext/libxml/libxml.c:1.45 Sun Feb 26 11:57:14 2006 +++ php-src/ext/libxml/libxml.c Tue Jun 13 13:12:18 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: libxml.c,v 1.45 2006/02/26 11:57:14 dmitry Exp $ */ +/* $Id: libxml.c,v 1.46 2006/06/13 13:12:18 dmitry Exp $ */ #define IS_EXT_MODULE @@ -60,11 +60,8 @@ static HashTable php_libxml_exports; -#ifdef ZTS -int libxml_globals_id; -#else -PHP_LIBXML_API php_libxml_globals libxml_globals; -#endif +ZEND_DECLARE_MODULE_GLOBALS(libxml) +static PHP_GINIT_FUNCTION(libxml); zend_class_entry *libxmlerror_class_entry; @@ -106,7 +103,11 @@ PHP_RSHUTDOWN(libxml), /* per-request shutdown function */ PHP_MINFO(libxml), /* information function */ NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(libxml), /* globals descriptor */ + PHP_GINIT(libxml), /* globals ctor */ + NULL, /* globals dtor */ + NULL, /* post deactivate */ + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ @@ -237,14 +238,12 @@ /* }}} */ /* {{{ startup, shutdown and info functions */ -#ifdef ZTS -static void php_libxml_init_globals(php_libxml_globals *libxml_globals_p TSRMLS_DC) +static PHP_GINIT_FUNCTION(libxml) { - LIBXML(stream_context) = NULL; - LIBXML(error_buffer).c = NULL; - LIBXML(error_list) = NULL; + libxml_globals->stream_context = NULL; + libxml_globals->error_buffer.c = NULL; + libxml_globals->error_list = NULL; } -#endif /* Channel libxml file io layer through the PHP streams subsystem. * This allows use of ftps:// and https:// urls */ @@ -575,14 +574,6 @@ php_libxml_initialize(); -#ifdef ZTS - ts_allocate_id(&libxml_globals_id, sizeof(php_libxml_globals), (ts_allocate_ctor) php_libxml_init_globals, NULL); -#else - LIBXML(stream_context) = NULL; - LIBXML(error_buffer).c = NULL; - LIBXML(error_list) = NULL; -#endif - REGISTER_LONG_CONSTANT("LIBXML_VERSION", LIBXML_VERSION, CONST_CS | CONST_PERSISTENT); REGISTER_STRING_CONSTANT("LIBXML_DOTTED_VERSION", LIBXML_DOTTED_VERSION, CONST_CS | CONST_PERSISTENT); http://cvs.php.net/viewcvs.cgi/php-src/ext/libxml/php_libxml.h?r1=1.18&r2=1.19&diff_format=u Index: php-src/ext/libxml/php_libxml.h diff -u php-src/ext/libxml/php_libxml.h:1.18 php-src/ext/libxml/php_libxml.h:1.19 --- php-src/ext/libxml/php_libxml.h:1.18 Sun Jan 1 13:09:51 2006 +++ php-src/ext/libxml/php_libxml.h Tue Jun 13 13:12:18 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_libxml.h,v 1.18 2006/01/01 13:09:51 sniper Exp $ */ +/* $Id: php_libxml.h,v 1.19 2006/06/13 13:12:18 dmitry Exp $ */ #ifndef PHP_LIBXML_H #define PHP_LIBXML_H @@ -37,11 +37,11 @@ #define LIBXML_SAVE_NOEMPTYTAG 1<<2 -typedef struct { +ZEND_BEGIN_MODULE_GLOBALS(libxml) zval *stream_context; smart_str error_buffer; zend_llist *error_list; -} php_libxml_globals; +ZEND_END_MODULE_GLOBALS(libxml) typedef struct _libxml_doc_props { int formatoutput; @@ -103,7 +103,7 @@ PHP_LIBXML_API void php_libxml_shutdown(); #ifdef ZTS -#define LIBXML(v) TSRMG(libxml_globals_id, php_libxml_globals *, v) +#define LIBXML(v) TSRMG(libxml_globals_id, zend_libxml_globals *, v) #else #define LIBXML(v) (libxml_globals.v) #endif http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.256&r2=1.257&diff_format=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.256 php-src/ext/mbstring/mbstring.c:1.257 --- php-src/ext/mbstring/mbstring.c:1.256 Thu May 11 14:37:42 2006 +++ php-src/ext/mbstring/mbstring.c Tue Jun 13 13:12:18 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.256 2006/05/11 14:37:42 masugata Exp $ */ +/* $Id: mbstring.c,v 1.257 2006/06/13 13:12:18 dmitry Exp $ */ /* * PHP 4 Multibyte String module "mbstring" @@ -82,8 +82,9 @@ #include "oniguruma/oniguruma.h" /* {{{ prototypes */ -static void _php_mb_globals_ctor(zend_mbstring_globals *pglobals TSRMLS_DC); -static void _php_mb_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC); +ZEND_DECLARE_MODULE_GLOBALS(mbstring) +static PHP_GINIT_FUNCTION(mbstring); +static PHP_GSHUTDOWN_FUNCTION(mbstring); /* }}} */ /* {{{ php_mb_default_identify_list */ @@ -253,7 +254,11 @@ PHP_RSHUTDOWN(mbstring), PHP_MINFO(mbstring), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(mbstring), + PHP_GINIT(mbstring), + PHP_GSHUTDOWN(mbstring), + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ @@ -265,8 +270,6 @@ }; /* }}} */ -ZEND_DECLARE_MODULE_GLOBALS(mbstring) - #ifdef COMPILE_DL_MBSTRING ZEND_GET_MODULE(mbstring) # ifdef PHP_WIN32 @@ -775,7 +778,7 @@ /* }}} */ /* {{{ module global initialize handler */ -static void _php_mb_globals_ctor(zend_mbstring_globals *pglobals TSRMLS_DC) +static PHP_GINIT_FUNCTION(mbstring) { MBSTRG(language) = mbfl_no_language_uni; MBSTRG(current_language) = MBSTRG(language); @@ -808,18 +811,18 @@ MBSTRG(func_overload) = 0; MBSTRG(encoding_translation) = 0; MBSTRG(strict_detection) = 0; - pglobals->outconv = NULL; + mbstring_globals->outconv = NULL; #if HAVE_MBREGEX - _php_mb_regex_globals_ctor(pglobals TSRMLS_CC); + _php_mb_regex_globals_ctor(mbstring_globals TSRMLS_CC); #endif } /* }}} */ -/* {{{ static void _php_mb_globals_dtor() */ -static void _php_mb_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC) +/* {{{ PHP_GSHUTDOWN_FUNCTION */ +static PHP_GSHUTDOWN_FUNCTION(mbstring) { #if HAVE_MBREGEX - _php_mb_regex_globals_dtor(pglobals TSRMLS_CC); + _php_mb_regex_globals_dtor(mbstring_globals TSRMLS_CC); #endif } /* }}} */ @@ -829,14 +832,6 @@ { __mbfl_allocators = &_php_mb_allocators; -#ifdef ZTS - ts_allocate_id(&mbstring_globals_id, sizeof(zend_mbstring_globals), - (ts_allocate_ctor) _php_mb_globals_ctor, - (ts_allocate_dtor) _php_mb_globals_dtor); -#else - _php_mb_globals_ctor(&mbstring_globals TSRMLS_CC); -#endif - REGISTER_INI_ENTRIES(); if (MBSTRG(encoding_translation)) { @@ -880,12 +875,6 @@ PHP_MSHUTDOWN(mb_regex) (INIT_FUNC_ARGS_PASSTHRU); #endif -#ifdef ZTS - ts_free_id(mbstring_globals_id); -#else - _php_mb_globals_dtor(&mbstring_globals TSRMLS_CC); -#endif - return SUCCESS; } /* }}} */ http://cvs.php.net/viewcvs.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.97&r2=1.98&diff_format=u Index: php-src/ext/mcrypt/mcrypt.c diff -u php-src/ext/mcrypt/mcrypt.c:1.97 php-src/ext/mcrypt/mcrypt.c:1.98 --- php-src/ext/mcrypt/mcrypt.c:1.97 Wed May 31 20:13:13 2006 +++ php-src/ext/mcrypt/mcrypt.c Tue Jun 13 13:12:18 2006 @@ -16,7 +16,7 @@ | Derick Rethans <derick@derickrethans.nl> | +----------------------------------------------------------------------+ */ -/* $Id: mcrypt.c,v 1.97 2006/05/31 20:13:13 derick Exp $ */ +/* $Id: mcrypt.c,v 1.98 2006/06/13 13:12:18 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -93,6 +93,8 @@ static PHP_MINIT_FUNCTION(mcrypt); static PHP_MSHUTDOWN_FUNCTION(mcrypt); +ZEND_DECLARE_MODULE_GLOBALS(mcrypt) + zend_module_entry mcrypt_module_entry = { STANDARD_MODULE_HEADER, "mcrypt", @@ -101,11 +103,13 @@ NULL, NULL, PHP_MINFO(mcrypt), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES, + PHP_MODULE_GLOBALS(mcrypt), + NULL, + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; -ZEND_DECLARE_MODULE_GLOBALS(mcrypt) - #ifdef COMPILE_DL_MCRYPT ZEND_GET_MODULE(mcrypt) #endif @@ -245,11 +249,6 @@ static PHP_MINIT_FUNCTION(mcrypt) { -#if defined(ZTS) - ZEND_INIT_MODULE_GLOBALS(mcrypt, NULL, NULL); - Z_TYPE(mcrypt_module_entry) = type; -#endif - le_mcrypt = zend_register_list_destructors_ex(php_mcrypt_module_dtor, NULL, "mcrypt", module_number); /* modes for mcrypt_??? routines */ http://cvs.php.net/viewcvs.cgi/php-src/ext/mime_magic/mime_magic.c?r1=1..48&r2=1.49&diff_format=u Index: php-src/ext/mime_magic/mime_magic.c diff -u php-src/ext/mime_magic/mime_magic.c:1.48 php-src/ext/mime_magic/mime_magic.c:1.49 --- php-src/ext/mime_magic/mime_magic.c:1.48 Sun Feb 19 04:29:41 2006 +++ php-src/ext/mime_magic/mime_magic.c Tue Jun 13 13:12:18 2006 @@ -15,7 +15,7 @@ | Author: Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ - $Id: mime_magic.c,v 1.48 2006/02/19 04:29:41 andi Exp $ + $Id: mime_magic.c,v 1.49 2006/06/13 13:12:18 dmitry Exp $ This module contains a lot of stuff taken from Apache mod_mime_magic, so the license section is a little bit longer than usual: @@ -212,7 +212,7 @@ static void magic_free_config(magic_req_rec *); ZEND_DECLARE_MODULE_GLOBALS(mime_magic) - +static PHP_GINIT_FUNCTION(mime_magic); /* True global resources - no need for thread safety here */ static magic_server_config_rec mime_global; @@ -240,7 +240,15 @@ #if ZEND_MODULE_API_NO >= 20010901 "0.1", #endif +#if ZEND_MODULE_API_NO >= 20060613 + PHP_MODULE_GLOBALS(mime_magic), + PHP_GINIT(mime_magic), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX +#else STANDARD_MODULE_PROPERTIES +#endif }; /* }}} */ @@ -256,9 +264,9 @@ PHP_INI_END() /* }}} */ -/* {{{ php_mime_magic_init_globals +/* {{{ PHP_GINIT_FUNCTION */ -static void php_mime_magic_init_globals(zend_mime_magic_globals *mime_magic_globals) +static PHP_GINIT_FUNCTION(mime_magic) { memset(mime_magic_globals, 0, sizeof(zend_mime_magic_globals)); mime_global.magic = NULL; @@ -270,7 +278,6 @@ */ PHP_MINIT_FUNCTION(mime_magic) { - ZEND_INIT_MODULE_GLOBALS(mime_magic, php_mime_magic_init_globals, NULL); REGISTER_INI_ENTRIES(); if (MIME_MAGIC_G(magicfile)) { http://cvs.php.net/viewcvs.cgi/php-src/ext/mssql/php_mssql.c?r1=1.165&r2=1.166&diff_format=u Index: php-src/ext/mssql/php_mssql.c diff -u php-src/ext/mssql/php_mssql.c:1.165 php-src/ext/mssql/php_mssql.c:1.166 --- php-src/ext/mssql/php_mssql.c:1.165 Tue Apr 4 18:49:44 2006 +++ php-src/ext/mssql/php_mssql.c Tue Jun 13 13:12:19 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.165 2006/04/04 18:49:44 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.166 2006/06/13 13:12:19 dmitry Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -81,6 +81,9 @@ {NULL, NULL, NULL} }; +ZEND_DECLARE_MODULE_GLOBALS(mssql) +static PHP_GINIT_FUNCTION(mssql); + zend_module_entry mssql_module_entry = { STANDARD_MODULE_HEADER, @@ -91,12 +94,14 @@ PHP_RINIT(mssql), PHP_RSHUTDOWN(mssql), PHP_MINFO(mssql), - NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + NO_VERSION_YET, + PHP_MODULE_GLOBALS(mssql), + PHP_GINIT(mssql), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; -ZEND_DECLARE_MODULE_GLOBALS(mssql) - #ifdef COMPILE_DL_MSSQL ZEND_GET_MODULE(mssql) # ifdef PHP_WIN32 @@ -273,7 +278,7 @@ zval_ptr_dtor(&(bind->zval)); } -static void php_mssql_init_globals(zend_mssql_globals *mssql_globals) +static PHP_GINIT_FUNCTION(mssql) { long compatability_mode; @@ -288,8 +293,6 @@ PHP_MINIT_FUNCTION(mssql) { - ZEND_INIT_MODULE_GLOBALS(mssql, php_mssql_init_globals, NULL); - REGISTER_INI_ENTRIES(); le_statement = zend_register_list_destructors_ex(_free_mssql_statement, NULL, "mssql statement", module_number); http://cvs.php.net/viewcvs.cgi/php-src/ext/mysql/php_mysql.c?r1=1.222&r2=1.223&diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.222 php-src/ext/mysql/php_mysql.c:1.223 --- php-src/ext/mysql/php_mysql.c:1.222 Thu Jun 1 19:15:31 2006 +++ php-src/ext/mysql/php_mysql.c Tue Jun 13 13:12:19 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.222 2006/06/01 19:15:31 mike Exp $ */ +/* $Id: php_mysql.c,v 1.223 2006/06/13 13:12:19 dmitry Exp $ */ /* TODO: * @@ -109,6 +109,9 @@ (mysql_field_count(mysql)>0) #endif +ZEND_DECLARE_MODULE_GLOBALS(mysql) +static PHP_GINIT_FUNCTION(mysql); + typedef struct _php_mysql_conn { MYSQL conn; int active_result_id; @@ -212,12 +215,14 @@ PHP_RSHUTDOWN(mysql), PHP_MINFO(mysql), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(mysql), + PHP_GINIT(mysql), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ -ZEND_DECLARE_MODULE_GLOBALS(mysql) - #ifdef COMPILE_DL_MYSQL ZEND_GET_MODULE(mysql) #endif @@ -346,9 +351,9 @@ PHP_INI_END() /* }}} */ -/* {{{ php_mysql_init_globals +/* {{{ PHP_GINIT_FUNCTION */ -static void php_mysql_init_globals(zend_mysql_globals *mysql_globals) +static PHP_GINIT_FUNCTION(mysql) { mysql_globals->num_persistent = 0; mysql_globals->default_socket = NULL; @@ -367,8 +372,6 @@ */ ZEND_MODULE_STARTUP_D(mysql) { - ZEND_INIT_MODULE_GLOBALS(mysql, php_mysql_init_globals, NULL); - REGISTER_INI_ENTRIES(); le_result = zend_register_list_destructors_ex(_free_mysql_result, NULL, "mysql result", module_number); le_link = zend_register_list_destructors_ex(_close_mysql_link, NULL, "mysql link", module_number); http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli.c?r1=1.89&r2=1.90&diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.89 php-src/ext/mysqli/mysqli.c:1.90 --- php-src/ext/mysqli/mysqli.c:1.89 Mon May 29 16:55:40 2006 +++ php-src/ext/mysqli/mysqli.c Tue Jun 13 13:12:19 2006 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli.c,v 1.89 2006/05/29 16:55:40 mike Exp $ + $Id: mysqli.c,v 1.90 2006/06/13 13:12:19 dmitry Exp $ */ #ifdef HAVE_CONFIG_H @@ -35,6 +35,8 @@ #define MYSQLI_USE_RESULT 1 ZEND_DECLARE_MODULE_GLOBALS(mysqli) +static PHP_GINIT_FUNCTION(mysqli); + static zend_object_handlers mysqli_object_handlers; static HashTable classes; static HashTable mysqli_driver_properties; @@ -368,7 +370,11 @@ PHP_RSHUTDOWN(mysqli), PHP_MINFO(mysqli), "0.1", /* Replace with version number for your extension */ - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(mysqli), + PHP_GINIT(mysqli), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ @@ -390,9 +396,9 @@ /* }}} */ -/* {{{ php_mysqli_init_globals +/* {{{ PHP_GINIT_FUNCTION */ -static void php_mysqli_init_globals(zend_mysqli_globals *mysqli_globals) +static PHP_GINIT_FUNCTION(mysqli) { mysqli_globals->num_links = 0; mysqli_globals->max_links = 0; @@ -419,7 +425,6 @@ zend_class_entry *ce,cex; zend_object_handlers *std_hnd = zend_get_std_object_handlers(); - ZEND_INIT_MODULE_GLOBALS(mysqli, php_mysqli_init_globals, NULL); REGISTER_INI_ENTRIES(); memcpy(&mysqli_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8.c?r1=1.301&r2=1.302&diff_format=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.301 php-src/ext/oci8/oci8.c:1.302 --- php-src/ext/oci8/oci8.c:1.301 Mon Jun 5 07:34:00 2006 +++ php-src/ext/oci8/oci8.c Tue Jun 13 13:12:19 2006 @@ -26,7 +26,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.301 2006/06/05 07:34:00 tony2001 Exp $ */ +/* $Id: oci8.c,v 1.302 2006/06/13 13:12:19 dmitry Exp $ */ /* TODO * * file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty() with OCI_ATTR_LOBEMPTY @@ -50,6 +50,7 @@ #include "php_oci8_int.h" ZEND_DECLARE_MODULE_GLOBALS(oci) +static PHP_GINIT_FUNCTION(oci); /* True globals, no need for thread safety */ int le_connection; @@ -371,7 +372,11 @@ PHP_RSHUTDOWN(oci), /* per-request shutdown function */ PHP_MINFO(oci), /* information function */ "1.1", - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(oci), /* globals descriptor */ + PHP_GINIT(oci), /* globals ctor */ + NULL, /* globals dtor */ + NULL, /* post deactivate */ + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ @@ -454,10 +459,10 @@ } } /* }}} */ -/* {{{ php_oci_init_globals() +/* {{{ PHP_GINIT_FUNCTION Zerofill globals during module init */ -static void php_oci_init_globals(zend_oci_globals *oci_globals TSRMLS_DC) +static PHP_GINIT_FUNCTION(oci) { memset(oci_globals, 0, sizeof(zend_oci_globals)); } @@ -486,7 +491,6 @@ OCIInitialize(PHP_OCI_INIT_MODE, NULL, NULL, NULL, NULL); #endif - ZEND_INIT_MODULE_GLOBALS(oci, php_oci_init_globals, NULL); REGISTER_INI_ENTRIES(); le_statement = zend_register_list_destructors_ex(php_oci_statement_list_dtor, NULL, "oci8 statement", module_number); @@ -647,7 +651,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.301 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.302 $"); sprintf(buf, "%ld", OCI_G(num_persistent)); php_info_print_table_row(2, "Active Persistent Connections", buf); http://cvs.php.net/viewcvs.cgi/php-src/ext/odbc/php_odbc.c?r1=1.194&r2=1.195&diff_format=u Index: php-src/ext/odbc/php_odbc.c diff -u php-src/ext/odbc/php_odbc.c:1.194 php-src/ext/odbc/php_odbc.c:1.195 --- php-src/ext/odbc/php_odbc.c:1.194 Sun Feb 19 00:55:20 2006 +++ php-src/ext/odbc/php_odbc.c Tue Jun 13 13:12:19 2006 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.194 2006/02/19 00:55:20 andi Exp $ */ +/* $Id: php_odbc.c,v 1.195 2006/06/13 13:12:19 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -130,6 +130,9 @@ }; /* }}} */ +ZEND_DECLARE_MODULE_GLOBALS(odbc); +static PHP_GINIT_FUNCTION(odbc); + /* {{{ odbc_module_entry */ zend_module_entry odbc_module_entry = { @@ -142,16 +145,14 @@ PHP_RSHUTDOWN(odbc), PHP_MINFO(odbc), "1.0", - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(odbc), + PHP_GINIT(odbc), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ -#ifdef ZTS -int odbc_globals_id; -#else -ZEND_API php_odbc_globals odbc_globals; -#endif - #ifdef COMPILE_DL_ODBC ZEND_GET_MODULE(odbc) # ifdef PHP_WIN32 @@ -403,12 +404,10 @@ PHP_INI_END() /* }}} */ -#ifdef ZTS -static void php_odbc_init_globals(php_odbc_globals *odbc_globals_p TSRMLS_DC) +static PHP_GINIT_FUNCTION(odbc) { - ODBCG(num_persistent) = 0; + odbc_globals->num_persistent = 0; } -#endif /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(odbc) @@ -418,12 +417,6 @@ RETCODE rc; #endif -#ifdef ZTS - ts_allocate_id(&odbc_globals_id, sizeof(php_odbc_globals), php_odbc_init_globals, NULL); -#else - ODBCG(num_persistent) = 0; -#endif - REGISTER_INI_ENTRIES(); le_result = zend_register_list_destructors_ex(_free_odbc_result, NULL, "odbc result", module_number); le_conn = zend_register_list_destructors_ex(_close_odbc_conn, NULL, "odbc link", module_number); http://cvs.php.net/viewcvs.cgi/php-src/ext/pcntl/pcntl.c?r1=1.54&r2=1..55&diff_format=u Index: php-src/ext/pcntl/pcntl.c diff -u php-src/ext/pcntl/pcntl.c:1.54 php-src/ext/pcntl/pcntl.c:1.55 --- php-src/ext/pcntl/pcntl.c:1.54 Tue May 30 17:44:23 2006 +++ php-src/ext/pcntl/pcntl.c Tue Jun 13 13:12:19 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pcntl.c,v 1.54 2006/05/30 17:44:23 mike Exp $ */ +/* $Id: pcntl.c,v 1.55 2006/06/13 13:12:19 dmitry Exp $ */ #define PCNTL_DEBUG 0 @@ -42,6 +42,7 @@ #endif ZEND_DECLARE_MODULE_GLOBALS(pcntl) +static PHP_GINIT_FUNCTION(pcntl); zend_function_entry pcntl_functions[] = { PHP_FE(pcntl_fork, NULL) @@ -75,7 +76,11 @@ PHP_RSHUTDOWN(pcntl), PHP_MINFO(pcntl), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(pcntl), + PHP_GINIT(pcntl), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; #ifdef COMPILE_DL_PCNTL @@ -160,7 +165,7 @@ #endif } -static void php_pcntl_init_globals(zend_pcntl_globals *pcntl_globals) +static PHP_GINIT_FUNCTION(pcntl) { memset(pcntl_globals, 0, sizeof(*pcntl_globals)); } @@ -175,7 +180,6 @@ PHP_MINIT_FUNCTION(pcntl) { php_register_signal_constants(INIT_FUNC_ARGS_PASSTHRU); - ZEND_INIT_MODULE_GLOBALS(pcntl, php_pcntl_init_globals, NULL); php_add_tick_function(pcntl_tick_handler); return SUCCESS; http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/php_pcre.c?r1=1.183&r2=1.184&diff_format=u Index: php-src/ext/pcre/php_pcre.c diff -u php-src/ext/pcre/php_pcre.c:1.183 php-src/ext/pcre/php_pcre.c:1.184 --- php-src/ext/pcre/php_pcre.c:1.183 Mon May 29 21:31:30 2006 +++ php-src/ext/pcre/php_pcre.c Tue Jun 13 13:12:19 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.183 2006/05/29 21:31:30 tony2001 Exp $ */ +/* $Id: php_pcre.c,v 1.184 2006/06/13 13:12:19 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -97,7 +97,7 @@ } -static void php_pcre_init_globals(zend_pcre_globals *pcre_globals TSRMLS_DC) +static PHP_GINIT_FUNCTION(pcre) { zend_hash_init(&pcre_globals->pcre_cache, 0, NULL, php_free_pcre_cache, 1); pcre_globals->backtrack_limit = 0; @@ -105,7 +105,7 @@ pcre_globals->error_code = PHP_PCRE_NO_ERROR; } -static void php_pcre_shutdown_globals(zend_pcre_globals *pcre_globals TSRMLS_DC) +static PHP_GSHUTDOWN_FUNCTION(pcre) { zend_hash_destroy(&pcre_globals->pcre_cache); } @@ -129,8 +129,6 @@ /* {{{ PHP_MINIT_FUNCTION(pcre) */ static PHP_MINIT_FUNCTION(pcre) { - ZEND_INIT_MODULE_GLOBALS(pcre, php_pcre_init_globals, php_pcre_shutdown_globals); - REGISTER_INI_ENTRIES(); REGISTER_LONG_CONSTANT("PREG_PATTERN_ORDER", PREG_PATTERN_ORDER, CONST_CS | CONST_PERSISTENT); @@ -154,12 +152,6 @@ /* {{{ PHP_MSHUTDOWN_FUNCTION(pcre) */ static PHP_MSHUTDOWN_FUNCTION(pcre) { -#ifdef ZTS - ts_free_id(pcre_globals_id); -#else - php_pcre_shutdown_globals(&pcre_globals TSRMLS_CC); -#endif - UNREGISTER_INI_ENTRIES(); return SUCCESS; @@ -1776,7 +1768,11 @@ NULL, PHP_MINFO(pcre), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(pcre), + PHP_GINIT(pcre), + PHP_GSHUTDOWN(pcre), + NULL, + STANDARD_MODULE_PROPERTIES_EX }; #ifdef COMPILE_DL_PCRE http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo.c?r1=1.74&r2=1.75&diff_format=u Index: php-src/ext/pdo/pdo.c diff -u php-src/ext/pdo/pdo.c:1.74 php-src/ext/pdo/pdo.c:1.75 --- php-src/ext/pdo/pdo.c:1.74 Wed Jun 7 21:13:32 2006 +++ php-src/ext/pdo/pdo.c Tue Jun 13 13:12:19 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo.c,v 1.74 2006/06/07 21:13:32 rasmus Exp $ */ +/* $Id: pdo.c,v 1.75 2006/06/13 13:12:19 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,6 +36,7 @@ static zend_class_entry *spl_ce_RuntimeException; ZEND_DECLARE_MODULE_GLOBALS(pdo) +static PHP_GINIT_FUNCTION(pdo); /* True global resources - no need for thread safety here */ @@ -141,7 +142,11 @@ NULL, PHP_MINFO(pdo), "1.1dev", - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(pdo), + PHP_GINIT(pdo), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ @@ -158,8 +163,8 @@ PHP_INI_END() /* }}} */ -/* {{{ php_pdo_init_globals */ -static void php_pdo_init_globals(zend_pdo_globals *pdo_globals) +/* {{{ PHP_GINIT_FUNCTION */ +static PHP_GINIT_FUNCTION(pdo) { pdo_globals->global_value = 0; } @@ -316,7 +321,6 @@ spl_ce_RuntimeException = NULL; - ZEND_INIT_MODULE_GLOBALS(pdo, php_pdo_init_globals, NULL); REGISTER_INI_ENTRIES(); if (FAILURE == pdo_sqlstate_init_error_table()) { http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_dblib/pdo_dblib.c?r1=1.12&r2=1.13&diff_format=u Index: php-src/ext/pdo_dblib/pdo_dblib.c diff -u php-src/ext/pdo_dblib/pdo_dblib.c:1.12 php-src/ext/pdo_dblib/pdo_dblib.c:1.13 --- php-src/ext/pdo_dblib/pdo_dblib.c:1.12 Sun Jan 1 13:09:52 2006 +++ php-src/ext/pdo_dblib/pdo_dblib.c Tue Jun 13 13:12:19 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_dblib.c,v 1.12 2006/01/01 13:09:52 sniper Exp $ */ +/* $Id: pdo_dblib.c,v 1.13 2006/06/13 13:12:19 dmitry Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -33,6 +33,7 @@ #include "zend_exceptions.h" ZEND_DECLARE_MODULE_GLOBALS(dblib) +static PHP_GINIT_FUNCTION(dblib) zend_function_entry pdo_dblib_functions[] = { {NULL, NULL, NULL} @@ -66,7 +67,11 @@ PHP_RSHUTDOWN(pdo_dblib), PHP_MINFO(pdo_dblib), "0.9", - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBASLS(dblib), + PHP_GINIT(dblib), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; #if defined(COMPILE_DL_PDO_DBLIB) || defined(COMPILE_DL_PDO_MSSQL) @@ -146,11 +151,10 @@ return 0; } -static int init_dblib_globals(zend_dblib_globals *g) +static PHP_GINIT_FUNCTION(dblib) { - memset(g, 0, sizeof(*g)); - g->err.sqlstate = g->sqlstate; - return SUCCESS; + memset(dblib_globals, 0, sizeof(*dblib_globals)); + dblib_globals->err.sqlstate = dblib_globals->sqlstate; } PHP_RSHUTDOWN_FUNCTION(pdo_dblib) @@ -180,8 +184,6 @@ return FAILURE; } - ZEND_INIT_MODULE_GLOBALS(dblib, init_dblib_globals, NULL); - /* TODO: dbsetifile() http://cvs.php.net/viewcvs.cgi/php-src/ext/pgsql/pgsql.c?r1=1.351&r2=1.352&diff_format=u Index: php-src/ext/pgsql/pgsql.c diff -u php-src/ext/pgsql/pgsql.c:1.351 php-src/ext/pgsql/pgsql.c:1.352 --- php-src/ext/pgsql/pgsql.c:1.351 Fri Jun 2 19:51:42 2006 +++ php-src/ext/pgsql/pgsql.c Tue Jun 13 13:12:19 2006 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.351 2006/06/02 19:51:42 mike Exp $ */ +/* $Id: pgsql.c,v 1.352 2006/06/13 13:12:19 dmitry Exp $ */ #include <stdlib.h> @@ -81,6 +81,9 @@ #define CHECK_DEFAULT_LINK(x) if ((x) == -1) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "No PostgreSQL link opened yet"); } +ZEND_DECLARE_MODULE_GLOBALS(pgsql) +static PHP_GINIT_FUNCTION(pgsql); + /* {{{ pgsql_functions[] */ zend_function_entry pgsql_functions[] = { @@ -248,7 +251,11 @@ PHP_RSHUTDOWN(pgsql), PHP_MINFO(pgsql), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(pgsql), + PHP_GINIT(pgsql), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ @@ -258,8 +265,6 @@ static int le_link, le_plink, le_result, le_lofp, le_string; -ZEND_DECLARE_MODULE_GLOBALS(pgsql) - /* {{{ _php_pgsql_trim_message */ static char * _php_pgsql_trim_message(const char *message, int *len) { @@ -446,9 +451,9 @@ PHP_INI_END() /* }}} */ -/* {{{ php_pgsql_init_globals +/* {{{ PHP_GINIT_FUNCTION */ -static void php_pgsql_init_globals(zend_pgsql_globals *pgsql_globals) +static PHP_GINIT_FUNCTION(pgsql) { memset(pgsql_globals, 0, sizeof(zend_pgsql_globals)); /* Initilize notice message hash at MINIT only */ @@ -460,8 +465,6 @@ */ PHP_MINIT_FUNCTION(pgsql) { - ZEND_INIT_MODULE_GLOBALS(pgsql, php_pgsql_init_globals, NULL); - REGISTER_INI_ENTRIES(); le_link = zend_register_list_destructors_ex(_close_pgsql_link, NULL, "pgsql link", module_number); http://cvs.php.net/viewcvs.cgi/php-src/ext/posix/posix.c?r1=1.74&r2=1..75&diff_format=u Index: php-src/ext/posix/posix.c diff -u php-src/ext/posix/posix.c:1.74 php-src/ext/posix/posix.c:1.75 --- php-src/ext/posix/posix.c:1.74 Sun Feb 19 00:55:20 2006 +++ php-src/ext/posix/posix.c Tue Jun 13 13:12:19 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: posix.c,v 1.74 2006/02/19 00:55:20 andi Exp $ */ +/* $Id: posix.c,v 1.75 2006/06/13 13:12:19 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -49,6 +49,7 @@ #endif ZEND_DECLARE_MODULE_GLOBALS(posix) +static PHP_MINFO_FUNCTION(posix); /* {{{ posix_functions[] */ @@ -143,12 +144,12 @@ static PHP_MINFO_FUNCTION(posix) { php_info_print_table_start(); - php_info_print_table_row(2, "Revision", "$Revision: 1.74 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.75 $"); php_info_print_table_end(); } /* }}} */ -static void php_posix_init_globals(zend_posix_globals *posix_globals TSRMLS_DC) +static PHP_GINIT_FUNCTION(posix) { posix_globals->last_error = 0; } @@ -157,7 +158,6 @@ */ static PHP_MINIT_FUNCTION(posix) { - ZEND_INIT_MODULE_GLOBALS(posix, php_posix_init_globals, NULL); REGISTER_LONG_CONSTANT("POSIX_F_OK", F_OK, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("POSIX_X_OK", X_OK, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("POSIX_W_OK", W_OK, CONST_CS | CONST_PERSISTENT); @@ -182,8 +182,6 @@ } /* }}} */ -static PHP_MINFO_FUNCTION(posix); - /* {{{ posix_module_entry */ zend_module_entry posix_module_entry = { @@ -195,8 +193,12 @@ NULL, NULL, PHP_MINFO(posix), - NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + NO_VERSION_YET, + PHP_MODULE_GLOBALS(posix), + PHP_GINIT(posix), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ http://cvs.php.net/viewcvs.cgi/php-src/ext/recode/recode.c?r1=1.38&r2=1.39&diff_format=u Index: php-src/ext/recode/recode.c diff -u php-src/ext/recode/recode.c:1.38 php-src/ext/recode/recode.c:1.39 --- php-src/ext/recode/recode.c:1.38 Sun Jan 1 13:09:53 2006 +++ php-src/ext/recode/recode.c Tue Jun 13 13:12:19 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: recode.c,v 1.38 2006/01/01 13:09:53 sniper Exp $ */ +/* $Id: recode.c,v 1.39 2006/06/13 13:12:19 dmitry Exp $ */ /* {{{ includes & prototypes */ @@ -64,6 +64,7 @@ #endif ZEND_DECLARE_MODULE_GLOBALS(recode); +static PHP_GINIT_FUNCTION(recode); /* {{{ module stuff */ static zend_function_entry php_recode_functions[] = { @@ -83,22 +84,24 @@ NULL, PHP_MINFO(recode), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(recode), + PHP_GINIT(recode), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; #ifdef COMPILE_DL_RECODE ZEND_GET_MODULE(recode) #endif -static void php_recode_init_globals (zend_recode_globals *rg) +static PHP_GINIT_FUNCTION(recode) { - rg->outer = NULL; + recode_globals->outer = NULL; } PHP_MINIT_FUNCTION(recode) { - ZEND_INIT_MODULE_GLOBALS(recode, php_recode_init_globals, NULL); - ReSG(outer) = recode_new_outer(false); if (ReSG(outer) == NULL) { return FAILURE; @@ -119,7 +122,7 @@ { php_info_print_table_start(); php_info_print_table_row(2, "Recode Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.38 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.39 $"); php_info_print_table_end(); } http://cvs.php.net/viewcvs.cgi/php-src/ext/session/session.c?r1=1.436&r2=1.437&diff_format=u Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.436 php-src/ext/session/session.c:1.437 --- php-src/ext/session/session.c:1.436 Sat Jun 3 11:19:43 2006 +++ php-src/ext/session/session.c Tue Jun 13 13:12:19 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.436 2006/06/03 11:19:43 mike Exp $ */ +/* $Id: session.c,v 1.437 2006/06/13 13:12:19 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -79,6 +79,7 @@ /* }}} */ PHPAPI ZEND_DECLARE_MODULE_GLOBALS(ps); +static PHP_GINIT_FUNCTION(ps); static ps_module *_php_find_ps_module(char *name TSRMLS_DC); static const ps_serializer *_php_find_ps_serializer(char *name TSRMLS_DC); @@ -250,7 +251,11 @@ PHP_RINIT(session), PHP_RSHUTDOWN(session), PHP_MINFO(session), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(ps), + PHP_GINIT(ps), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; #ifdef COMPILE_DL_SESSION @@ -1621,7 +1626,7 @@ } /* }}} */ -static void php_minit_session_globals(php_ps_globals *ps_globals) +static PHP_GINIT_FUNCTION(ps) { ps_globals->save_path = NULL; ps_globals->session_name = NULL; @@ -1634,15 +1639,6 @@ PHP_MINIT_FUNCTION(session) { -#ifdef ZTS - php_ps_globals *ps_globals; - - ts_allocate_id(&ps_globals_id, sizeof(php_ps_globals), (ts_allocate_ctor) php_minit_session_globals, NULL); - ps_globals = ts_resource(ps_globals_id); -#else - php_minit_session_globals(&ps_globals); -#endif - zend_register_auto_global("_SESSION", sizeof("_SESSION")-1, NULL TSRMLS_CC); PS(module_number) = module_number; /* if we really need this var we need to init it in zts mode as well! */ http://cvs.php.net/viewcvs.cgi/php-src/ext/skeleton/skeleton.c?r1=1.36&r2=1.37&diff_format=u Index: php-src/ext/skeleton/skeleton.c diff -u php-src/ext/skeleton/skeleton.c:1.36 php-src/ext/skeleton/skeleton.c:1.37 --- php-src/ext/skeleton/skeleton.c:1.36 Mon Dec 5 23:52:30 2005 +++ php-src/ext/skeleton/skeleton.c Tue Jun 13 13:12:19 2006 @@ -77,7 +77,6 @@ PHP_MINIT_FUNCTION(extname) { /* If you have INI entries, uncomment these lines - ZEND_INIT_MODULE_GLOBALS(extname, php_extname_init_globals, NULL); REGISTER_INI_ENTRIES(); */ return SUCCESS; http://cvs.php.net/viewcvs.cgi/php-src/ext/snmp/snmp.c?r1=1.108&r2=1.109&diff_format=u Index: php-src/ext/snmp/snmp.c diff -u php-src/ext/snmp/snmp.c:1.108 php-src/ext/snmp/snmp.c:1.109 --- php-src/ext/snmp/snmp.c:1.108 Sun Jan 1 13:09:53 2006 +++ php-src/ext/snmp/snmp.c Tue Jun 13 13:12:19 2006 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: snmp.c,v 1.108 2006/01/01 13:09:53 sniper Exp $ */ +/* $Id: snmp.c,v 1.109 2006/06/13 13:12:19 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -107,6 +107,7 @@ #define SNMP_VALUE_OBJECT 2 ZEND_DECLARE_MODULE_GLOBALS(snmp) +static PHP_GINIT_FUNCTION(snmp); /* constant - can be shared among threads */ static oid objid_mib[] = {1, 3, 6, 1, 2, 1}; @@ -164,7 +165,11 @@ NULL, PHP_MINFO(snmp), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(snmp), + PHP_GINIT(snmp), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ @@ -174,9 +179,9 @@ /* THREAD_LS snmp_module php_snmp_module; - may need one of these at some point */ -/* {{{ php_snmp_init_globals +/* {{{ PHP_GINIT_FUNCTION */ -static void php_snmp_init_globals(zend_snmp_globals *snmp_globals) +static PHP_GINIT_FUNCTION(snmp) { snmp_globals->valueretrieval = 0; } @@ -193,8 +198,6 @@ netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_DONT_PERSIST_STATE, 1); #endif - ZEND_INIT_MODULE_GLOBALS(snmp, php_snmp_init_globals, NULL); - REGISTER_LONG_CONSTANT("SNMP_VALUE_LIBRARY", SNMP_VALUE_LIBRARY, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("SNMP_VALUE_PLAIN", SNMP_VALUE_PLAIN, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("SNMP_VALUE_OBJECT", SNMP_VALUE_OBJECT, CONST_CS | CONST_PERSISTENT); http://cvs.php.net/viewcvs.cgi/php-src/ext/sockets/sockets.c?r1=1.179&r2=1.180&diff_format=u Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.179 php-src/ext/sockets/sockets.c:1.180 --- php-src/ext/sockets/sockets.c:1.179 Fri Apr 7 14:05:21 2006 +++ php-src/ext/sockets/sockets.c Tue Jun 13 13:12:19 2006 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.179 2006/04/07 14:05:21 pajoye Exp $ */ +/* $Id: sockets.c,v 1.180 2006/06/13 13:12:19 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -57,6 +57,7 @@ #endif ZEND_DECLARE_MODULE_GLOBALS(sockets) +static PHP_GINIT_FUNCTION(sockets); #ifndef MSG_WAITALL #ifdef LINUX @@ -157,7 +158,11 @@ PHP_RSHUTDOWN(sockets), PHP_MINFO(sockets), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(sockets), + PHP_GINIT(sockets), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; @@ -430,7 +435,7 @@ return 1; } -static void php_sockets_init_globals(zend_sockets_globals *sockets_globals TSRMLS_DC) +static PHP_GINIT_FUNCTION(sockets) { sockets_globals->last_error = 0; sockets_globals->strerror_buf = NULL; @@ -442,8 +447,6 @@ { struct protoent *pe; - ZEND_INIT_MODULE_GLOBALS(sockets, php_sockets_init_globals, NULL); - le_socket = zend_register_list_destructors_ex(php_destroy_socket, NULL, le_socket_name, module_number); REGISTER_LONG_CONSTANT("AF_UNIX", AF_UNIX, CONST_CS | CONST_PERSISTENT); http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/php_spl.c?r1=1.93&r2=1..94&diff_format=u Index: php-src/ext/spl/php_spl.c diff -u php-src/ext/spl/php_spl.c:1.93 php-src/ext/spl/php_spl.c:1.94 --- php-src/ext/spl/php_spl.c:1.93 Fri May 26 01:40:57 2006 +++ php-src/ext/spl/php_spl.c Tue Jun 13 13:12:19 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_spl.c,v 1.93 2006/05/26 01:40:57 helly Exp $ */ +/* $Id: php_spl.c,v 1.94 2006/06/13 13:12:19 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -50,9 +50,9 @@ }; /* }}} */ -/* {{{ spl_init_globals +/* {{{ PHP_GINIT_FUNCTION */ -static void spl_init_globals(zend_spl_globals *spl_globals) +static PHP_GINIT_FUNCTION(spl) { spl_globals->autoload_extensions = NULL; spl_globals->autoload_functions = NULL; @@ -656,8 +656,6 @@ */ PHP_MINIT_FUNCTION(spl) { - ZEND_INIT_MODULE_GLOBALS(spl, spl_init_globals, NULL); - PHP_MINIT(spl_iterators)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(spl_array)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(spl_directory)(INIT_FUNC_ARGS_PASSTHRU); @@ -715,7 +713,11 @@ PHP_RSHUTDOWN(spl), PHP_MINFO(spl), "0.2", - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(spl), + PHP_GINIT(spl), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ http://cvs.php.net/viewcvs.cgi/php-src/ext/sqlite/sqlite.c?r1=1.192&r2=1.193&diff_format=u Index: php-src/ext/sqlite/sqlite.c diff -u php-src/ext/sqlite/sqlite.c:1.192 php-src/ext/sqlite/sqlite.c:1.193 --- php-src/ext/sqlite/sqlite.c:1.192 Tue May 9 22:12:50 2006 +++ php-src/ext/sqlite/sqlite.c Tue Jun 13 13:12:19 2006 @@ -17,7 +17,7 @@ | Marcus Boerger <helly@php.net> | +----------------------------------------------------------------------+ - $Id: sqlite.c,v 1.192 2006/05/09 22:12:50 helly Exp $ + $Id: sqlite.c,v 1.193 2006/06/13 13:12:19 dmitry Exp $ */ #ifdef HAVE_CONFIG_H @@ -62,6 +62,7 @@ #endif ZEND_DECLARE_MODULE_GLOBALS(sqlite) +static PHP_GINIT_FUNCTION(sqlite); #if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) extern ps_module ps_mod_sqlite; @@ -300,7 +301,15 @@ #if ZEND_MODULE_API_NO >= 20010901 PHP_SQLITE_MODULE_VERSION, #endif +#if ZEND_MODULE_API_NO >= 20060613 + PHP_MODULE_GLOBALS(sqlite), + PHP_GINIT(sqlite), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX +#else STANDARD_MODULE_PROPERTIES +#endif }; @@ -1012,10 +1021,9 @@ } /* }}} */ -static int init_sqlite_globals(zend_sqlite_globals *g) +static PHP_GINIT_FUNCTION(sqlite) { - g->assoc_case = 0; - return SUCCESS; + sqlite_globals->assoc_case = 0; } PHP_MINIT_FUNCTION(sqlite) @@ -1047,8 +1055,6 @@ sqlite_ce_query->get_iterator = sqlite_get_iterator; sqlite_ce_query->iterator_funcs.funcs = &sqlite_query_iterator_funcs; - ZEND_INIT_MODULE_GLOBALS(sqlite, init_sqlite_globals, NULL); - REGISTER_INI_ENTRIES(); #if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) @@ -1123,7 +1129,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "SQLite support", "enabled"); - php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.192 2006/05/09 22:12:50 helly Exp $"); + php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.193 2006/06/13 13:12:19 dmitry Exp $"); php_info_print_table_row(2, "SQLite Library", sqlite_libversion()); php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding()); php_info_print_table_end(); http://cvs.php.net/viewcvs.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.111&r2=1.112&diff_format=u Index: php-src/ext/sybase_ct/php_sybase_ct.c diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.111 php-src/ext/sybase_ct/php_sybase_ct.c:1.112 --- php-src/ext/sybase_ct/php_sybase_ct.c:1.111 Wed May 24 20:22:34 2006 +++ php-src/ext/sybase_ct/php_sybase_ct.c Tue Jun 13 13:12:20 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.111 2006/05/24 20:22:34 tony2001 Exp $ */ +/* $Id: php_sybase_ct.c,v 1.112 2006/06/13 13:12:20 dmitry Exp $ */ #ifdef HAVE_CONFIG_H @@ -37,6 +37,10 @@ #if HAVE_SYBASE_CT +ZEND_DECLARE_MODULE_GLOBALS(sybase) +static PHP_GINIT_FUNCTION(sybase); +static PHP_GSHUTDOWN_FUNCTION(sybase); + zend_function_entry sybase_functions[] = { PHP_FE(sybase_connect, NULL) PHP_FE(sybase_pconnect, NULL) @@ -93,10 +97,21 @@ zend_module_entry sybase_module_entry = { STANDARD_MODULE_HEADER, - "sybase_ct", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES + "sybase_ct", + sybase_functions, + PHP_MINIT(sybase), + PHP_MSHUTDOWN(sybase), + PHP_RINIT(sybase), + PHP_RSHUTDOWN(sybase), + PHP_MINFO(sybase), + NO_VERSION_YET, + PHP_MODULE_GLOBALS(sybase), + PHP_GINIT(sybase), + PHP_GSHUTDOWN(sybase), + NULL, + STANDARD_MODULE_PROPERTIES_EX }; -ZEND_DECLARE_MODULE_GLOBALS(sybase) /* static CS_CONTEXT *context; */ #ifdef COMPILE_DL_SYBASE_CT @@ -356,7 +371,7 @@ PHP_INI_END() -static void php_sybase_init_globals(zend_sybase_globals *sybase_globals) +static PHP_GINIT_FUNCTION(sybase) { long opt; TSRMLS_FETCH(); @@ -407,7 +422,7 @@ } -static void php_sybase_destroy_globals(zend_sybase_globals *sybase_globals) +static PHP_GSHUTDOWN_FUNCTION(sybase) { ct_exit(sybase_globals->context, CS_UNUSED); cs_ctx_drop(sybase_globals->context); @@ -415,8 +430,6 @@ PHP_MINIT_FUNCTION(sybase) { - ZEND_INIT_MODULE_GLOBALS(sybase, php_sybase_init_globals, php_sybase_destroy_globals); - REGISTER_INI_ENTRIES(); le_link = zend_register_list_destructors_ex(_close_sybase_link, NULL, "sybase-ct link", module_number); @@ -442,11 +455,6 @@ PHP_MSHUTDOWN_FUNCTION(sybase) { UNREGISTER_INI_ENTRIES(); -#ifdef ZTS - ts_free_id(sybase_globals_id); -#else - php_sybase_destroy_globals(&sybase_globals TSRMLS_CC); -#endif #if 0 ct_exit(context, CS_UNUSED); cs_ctx_drop(context); http://cvs.php.net/viewcvs.cgi/php-src/ext/tidy/tidy.c?r1=1.88&r2=1.89&diff_format=u Index: php-src/ext/tidy/tidy.c diff -u php-src/ext/tidy/tidy.c:1.88 php-src/ext/tidy/tidy.c:1.89 --- php-src/ext/tidy/tidy.c:1.88 Sat Jun 3 11:19:44 2006 +++ php-src/ext/tidy/tidy.c Tue Jun 13 13:12:20 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tidy.c,v 1.88 2006/06/03 11:19:44 mike Exp $ */ +/* $Id: tidy.c,v 1.89 2006/06/13 13:12:20 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -335,7 +335,11 @@ NULL, PHP_MINFO(tidy), PHP_TIDY_MODULE_VERSION, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(tidy), + NULL, + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; #ifdef COMPILE_DL_TIDY @@ -950,20 +954,8 @@ return SUCCESS; } -static void tidy_globals_ctor(void *global TSRMLS_DC) -{ - -} - -static void tidy_globals_dtor(void *global TSRMLS_DC) -{ - -} - PHP_MINIT_FUNCTION(tidy) { - ZEND_INIT_MODULE_GLOBALS(tidy, tidy_globals_ctor, tidy_globals_dtor); - REGISTER_INI_ENTRIES(); REGISTER_TIDY_CLASS(tidy, doc, NULL, 0); REGISTER_TIDY_CLASS(tidyNode, node, NULL, ZEND_ACC_FINAL_CLASS); @@ -999,11 +991,6 @@ PHP_MSHUTDOWN_FUNCTION(tidy) { -#ifdef ZTS - ts_free_id(tidy_globals_id); -#else - tidy_globals_dtor(&tidy_globals TSRMLS_CC); -#endif UNREGISTER_INI_ENTRIES(); return SUCCESS; } @@ -1013,7 +1000,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Tidy support", "enabled"); php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate()); - php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.88 2006/06/03 11:19:44 mike Exp $)"); + php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.89 2006/06/13 13:12:20 dmitry Exp $)"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); http://cvs.php.net/viewcvs.cgi/php-src/ext/tokenizer/tokenizer.c?r1=1.36&r2=1.37&diff_format=u Index: php-src/ext/tokenizer/tokenizer.c diff -u php-src/ext/tokenizer/tokenizer.c:1.36 php-src/ext/tokenizer/tokenizer.c:1.37 --- php-src/ext/tokenizer/tokenizer.c:1.36 Sun Jan 1 13:09:56 2006 +++ php-src/ext/tokenizer/tokenizer.c Tue Jun 13 13:12:20 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tokenizer.c,v 1.36 2006/01/01 13:09:56 sniper Exp $ */ +/* $Id: tokenizer.c,v 1.37 2006/06/13 13:12:20 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -144,10 +144,10 @@ */ /* }}} */ -/* {{{ php_tokenizer_init_globals +/* {{{ PHP_GINIT_FUNCTION */ /* Uncomment this function if you have INI entries -static void php_tokenizer_init_globals(zend_tokenizer_globals *tokenizer_globals) +static PHP_GINIT_FUNCTION(tokenizer) { tokenizer_globals->global_value = 0; tokenizer_globals->global_string = NULL; @@ -160,7 +160,6 @@ PHP_MINIT_FUNCTION(tokenizer) { /* If you have INI entries, uncomment these lines - ZEND_INIT_MODULE_GLOBALS(tokenizer, php_tokenizer_init_globals, NULL); REGISTER_INI_ENTRIES(); */ http://cvs.php.net/viewcvs.cgi/php-src/ext/xml/php_xml.h?r1=1.30&r2=1..31&diff_format=u Index: php-src/ext/xml/php_xml.h diff -u php-src/ext/xml/php_xml.h:1.30 php-src/ext/xml/php_xml.h:1.31 --- php-src/ext/xml/php_xml.h:1.30 Sun Jan 1 13:09:56 2006 +++ php-src/ext/xml/php_xml.h Tue Jun 13 13:12:20 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xml.h,v 1.30 2006/01/01 13:09:56 sniper Exp $ */ +/* $Id: php_xml.h,v 1.31 2006/06/13 13:12:20 dmitry Exp $ */ #ifndef PHP_XML_H #define PHP_XML_H @@ -45,9 +45,9 @@ #error "UTF-16 Unicode support not implemented!" #endif -typedef struct { +ZEND_BEGIN_MODULE_GLOBALS(xml) XML_Char *default_encoding; -} php_xml_globals; +ZEND_END_MODULE_GLOBALS(xml) typedef struct { int index; @@ -147,7 +147,7 @@ #define phpext_xml_ptr xml_module_ptr #ifdef ZTS -#define XML(v) TSRMG(xml_globals_id, php_xml_globals *, v) +#define XML(v) TSRMG(xml_globals_id, zend_xml_globals *, v) #else #define XML(v) (xml_globals.v) #endif http://cvs.php.net/viewcvs.cgi/php-src/ext/xml/xml.c?r1=1.163&r2=1.164&diff_format=u Index: php-src/ext/xml/xml.c diff -u php-src/ext/xml/xml.c:1.163 php-src/ext/xml/xml.c:1.164 --- php-src/ext/xml/xml.c:1.163 Thu Feb 2 21:43:40 2006 +++ php-src/ext/xml/xml.c Tue Jun 13 13:12:20 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.163 2006/02/02 21:43:40 tony2001 Exp $ */ +/* $Id: xml.c,v 1.164 2006/06/13 13:12:20 dmitry Exp $ */ #define IS_EXT_MODULE @@ -57,11 +57,7 @@ * - Weird things happen with <![CDATA[]]> sections. */ -#ifdef ZTS -int xml_globals_id; -#else -PHP_XML_API php_xml_globals xml_globals; -#endif +ZEND_DECLARE_MODULE_GLOBALS(xml) /* {{{ dynamically loadable module stuff */ #ifdef COMPILE_DL_XML @@ -75,6 +71,7 @@ /* {{{ function prototypes */ PHP_MINIT_FUNCTION(xml); PHP_MINFO_FUNCTION(xml); +static PHP_GINIT_FUNCTION(xml); static void xml_parser_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC); static void xml_set_handler(zval **, zval **); @@ -161,7 +158,11 @@ NULL, /* per-request shutdown function */ PHP_MINFO(xml), /* information function */ NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(xml), /* globals descriptor */ + PHP_GINIT(xml), /* globals ctor */ + NULL, /* globals dtor */ + NULL, /* post deactivate */ + STANDARD_MODULE_PROPERTIES_EX }; /* All the encoding functions are set to NULL right now, since all @@ -182,12 +183,10 @@ /* }}} */ /* {{{ startup, shutdown and info functions */ -#ifdef ZTS -static void php_xml_init_globals(php_xml_globals *xml_globals_p TSRMLS_DC) +static PHP_GINIT_FUNCTION(xml) { - XML(default_encoding) = "UTF-8"; + xml_globals->default_encoding = "UTF-8"; } -#endif static void *php_xml_malloc_wrapper(size_t sz) { @@ -210,12 +209,6 @@ { le_xml_parser = zend_register_list_destructors_ex(xml_parser_dtor, NULL, "xml", module_number); -#ifdef ZTS - ts_allocate_id(&xml_globals_id, sizeof(php_xml_globals), (ts_allocate_ctor) php_xml_init_globals, NULL); -#else - XML(default_encoding) = "UTF-8"; -#endif - REGISTER_LONG_CONSTANT("XML_ERROR_NONE", XML_ERROR_NONE, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("XML_ERROR_NO_MEMORY", XML_ERROR_NO_MEMORY, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("XML_ERROR_SYNTAX", XML_ERROR_SYNTAX, CONST_CS|CONST_PERSISTENT); http://cvs.php.net/viewcvs.cgi/php-src/ext/zlib/zlib.c?r1=1.197&r2=1.198&diff_format=u Index: php-src/ext/zlib/zlib.c diff -u php-src/ext/zlib/zlib.c:1.197 php-src/ext/zlib/zlib.c:1.198 --- php-src/ext/zlib/zlib.c:1.197 Sun Jun 11 20:33:29 2006 +++ php-src/ext/zlib/zlib.c Tue Jun 13 13:12:20 2006 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.197 2006/06/11 20:33:29 bjori Exp $ */ +/* $Id: zlib.c,v 1.198 2006/06/13 13:12:20 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -112,6 +112,8 @@ }; /* }}} */ +ZEND_DECLARE_MODULE_GLOBALS(zlib) + /* {{{ php_zlib_module_entry */ zend_module_entry php_zlib_module_entry = { @@ -124,12 +126,14 @@ NULL, PHP_MINFO(zlib), "1.1", - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(zlib), + NULL, + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ -ZEND_DECLARE_MODULE_GLOBALS(zlib) - #ifdef COMPILE_DL_ZLIB ZEND_GET_MODULE(php_zlib) #endif @@ -198,23 +202,12 @@ STD_PHP_INI_ENTRY("zlib.output_handler", "", PHP_INI_ALL, OnUpdate_zlib_output_handler, output_handler, zend_zlib_globals, zlib_globals) PHP_INI_END() -#ifdef ZTS -/* {{{ php_zlib_init_globals - */ -static void php_zlib_init_globals(zend_zlib_globals *zlib_globals_p TSRMLS_DC) -{ -} -/* }}} */ -#endif - /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(zlib) { zval tmp; -#ifdef ZTS - ts_allocate_id(&zlib_globals_id, sizeof(zend_zlib_globals), (ts_allocate_ctor) php_zlib_init_globals, NULL); -#endif + php_register_url_stream_wrapper("compress.zlib", &php_stream_gzip_wrapper TSRMLS_CC); php_stream_filter_register_factory("zlib.*", &php_zlib_filter_factory TSRMLS_CC); INIT_PZVAL(&tmp);