From cd4a39edf9e86bcaa5baec21fd5dcaad133a6677 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Thu, 12 Feb 2004 23:39:46 +0000 Subject: [PATCH] - Fixed start-up problem if both SPL and SimpleXML were enabled. The double initialization of apache 1.3 was causing problems here. --- NEWS | 2 ++ ext/simplexml/simplexml.c | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 764aa8d81a..a88245b41b 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2004, PHP 5 Release Candidate 1 +- Fixed start-up problem if both SPL and SimpleXML were enabled. The double + initialization of apache 1.3 was causing problems here. (Marcus, Derick) 12 Feb 2004, PHP 5 Beta 4 - Changed exceptions so that they must now inherit from the built-in Exception diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index dd29b368b2..564b2d6943 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -1539,7 +1539,7 @@ zend_module_entry simplexml_module_entry = { "simplexml", simplexml_functions, PHP_MINIT(simplexml), - NULL, + PHP_MSHUTDOWN(simplexml), NULL, NULL, PHP_MINFO(simplexml), @@ -1588,6 +1588,14 @@ PHP_MINIT_FUNCTION(simplexml) } /* }}} */ +/* {{{ PHP_MSHUTDOWN_FUNCTION(simplexml) + */ +PHP_MSHUTDOWN_FUNCTION(simplexml) +{ + sxe_class_entry = NULL; + return SUCCESS; +} +/* }}} */ /* {{{ PHP_MINFO_FUNCTION(simplexml) */ PHP_MINFO_FUNCTION(simplexml) -- 2.40.0