From: <ol...@us...> - 2007-04-04 09:40:58
|
Revision: 9670 http://swig.svn.sourceforge.net/swig/?rev=9670&view=rev Author: olly Date: 2007-04-04 02:40:55 -0700 (Wed, 04 Apr 2007) Log Message: ----------- [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 Modified Paths: -------------- trunk/CHANGES.current trunk/Source/Modules/php4.cxx Modified: trunk/CHANGES.current =================================================================== --- trunk/CHANGES.current 2007-04-03 15:56:36 UTC (rev 9669) +++ trunk/CHANGES.current 2007-04-04 09:40:55 UTC (rev 9670) @@ -1,6 +1,11 @@ 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 [PHP4] Add missing ZTS annotations to generated C++ wrapper code to fix compilation failures when using ZTS enabled SWIG (Linux Modified: trunk/Source/Modules/php4.cxx =================================================================== --- trunk/Source/Modules/php4.cxx 2007-04-03 15:56:36 UTC (rev 9669) +++ trunk/Source/Modules/php4.cxx 2007-04-04 09:40:55 UTC (rev 9670) @@ -811,10 +811,14 @@ Printf(s_init, " return SUCCESS;\n"); Printf(s_init, "}\n\n"); - Printf(s_init, "PHP_MSHUTDOWN_FUNCTION(%s)\n{\n", module); - Printf(s_init, "%s\n", s_shutdown); - Printf(s_init, " return SUCCESS;\n"); - Printf(s_init, "}\n\n"); + Printv(s_init, "PHP_MSHUTDOWN_FUNCTION(", module, ")\n" + "{\n", + s_shutdown, + "#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, "%s\n", r_shutdown); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |