- Fixed start-up problem if both SPL and SimpleXML were enabled. The

  double initialization of apache 1.3 was causing problems here.

diff --git a/NEWS b/NEWS
index 764aa8d81a5794fa5459a49376d1856ad5e78a63..a88245b41b3d3a3a6fe3d0c7a9b7eee84675550c 100644 (file)
--- 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 dd29b368b248a4bfb0162a34d9e5adc76290e2b5..564b2d69438606c53e1e8a59c6562d7c66368235 100644 (file)
--- 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)