jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PHP5] If ZTS is enabled, release <module>_globals_id in MSHUTDOWN

Browse source 
to avoid PHP interpreter crash on shutdown.  This solution was
suggested here: http://bugs.php.net/bug.php?id=40985


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9670 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2007-04-04 09:40:55 +00:00
commit 8b9af6389b
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.current
View file

@ -1,6 +1,11 @@
Version 1.3.32 (in progress) Version 1.3.32 (in progress)
============================ ============================
04/04/2007: olly
[PHP5] If ZTS is enabled, release <module>_globals_id in MSHUTDOWN
to avoid PHP interpreter crash on shutdown. This solution was
suggested here: http://bugs.php.net/bug.php?id=40985
04/03/2007: olly 04/03/2007: olly
[PHP4] Add missing ZTS annotations to generated C++ wrapper code [PHP4] Add missing ZTS annotations to generated C++ wrapper code
to fix compilation failures when using ZTS enabled SWIG (Linux to fix compilation failures when using ZTS enabled SWIG (Linux

12
Source/Modules/php4.cxx
View file

@ -811,10 +811,14 @@ public:
Printf(s_init, " return SUCCESS;\n"); Printf(s_init, " return SUCCESS;\n");
Printf(s_init, "}\n\n"); Printf(s_init, "}\n\n");
Printf(s_init, "PHP_MSHUTDOWN_FUNCTION(%s)\n{\n", module); Printv(s_init, "PHP_MSHUTDOWN_FUNCTION(", module, ")\n"
Printf(s_init, "%s\n", s_shutdown); "{\n",
Printf(s_init, " return SUCCESS;\n"); s_shutdown,
Printf(s_init, "}\n\n"); "#ifdef ZTS\n"
" ts_free_id(", module, "_globals_id);\n"
"#endif\n"
" return SUCCESS;\n"
"}\n\n", NIL);
Printf(s_init, "PHP_RSHUTDOWN_FUNCTION(%s)\n{\n", module); Printf(s_init, "PHP_RSHUTDOWN_FUNCTION(%s)\n{\n", module);
Printf(s_init, "%s\n", r_shutdown); Printf(s_init, "%s\n", r_shutdown);