com php/gtk-src: Fixes bug #55225 - segfault on cleanup after dl load: main/php_gtk.c
[email protected] (Elizabeth Marie Smith) Wed, 18 Jul 2012 19:03:24 +0000
| Newsgroups | php.gtk.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit: 598e23dcaf0669d68d497d7216eefd1bd5963e78=0AAuthor: Elizabeth = M Smith <[email protected]> Wed, 18 Jul 2012 15:03:24 -0400= =0AParents: ba6ed42850464c6eae51a0d65fb29bf3b976b5ac=0ABranches: master= =0A=0ALink: http://git.php.net/?p=3Dphp/gtk-src.git;a=3Dcommitdiff;h= =3D598e23dcaf0669d68d497d7216eefd1bd5963e78=0A=0ALog:=0AFixes bug #55225 - = segfault on cleanup after dl load=0A=0Amakes the module information for php= -gtk=0Aavailable in RINIT when the classes are registered=0Aas a nice side = effect that extension reflection works=0A=0ABugs:=0Ahttps://bugs.php.net/55= 225=0A=0AChanged paths:=0A M main/php_gtk.c=0A=0A=0ADiff:=0Adiff --git a/= main/php_gtk.c b/main/php_gtk.c=0Aindex 871f9d5..1f2e6fe 100644=0A--- a/mai= n/php_gtk.c=0A+++ b/main/php_gtk.c=0A@@ -180,6 +180,9 @@ PHP_MSHUTDOWN_FUNC= TION(gtk)=0A =0A PHP_RINIT_FUNCTION(gtk)=0A {=0A+=09zend_module_entry *temp= _module =3D EG(current_module);=0A+=09EG(current_module) =3D phpext_php_gtk= _ptr;=0A+=0A =09zend_alter_ini_entry("max_execution_time", sizeof("max_exec= ution_time")-1, "0", sizeof("0")-1,PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);= =0A =0A =09php_gtk_handlers =3D *zend_get_std_object_handlers();=0A@@ -211,= 6 +214,7 @@ PHP_RINIT_FUNCTION(gtk)=0A =09}=0A =0A =09php_gtk_startup_share= d_extensions(module_number);=0A+=09EG(current_module) =3D temp_module;=0A = =0A =09return SUCCESS;=0A }=0A