summaryrefslogtreecommitdiff
path: root/ext/simplexml
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2004-02-12 23:39:46 +0000
committerDerick Rethans <derick@php.net>2004-02-12 23:39:46 +0000
commitcd4a39edf9e86bcaa5baec21fd5dcaad133a6677 (patch)
tree46277c59be66e63dedab45b816bbeeed869b71fe /ext/simplexml
parent1507a4a6776ab55cf799cbd96d09620a3b364f7b (diff)
downloadphp-git-cd4a39edf9e86bcaa5baec21fd5dcaad133a6677.tar.gz
- Fixed start-up problem if both SPL and SimpleXML were enabled. The
double initialization of apache 1.3 was causing problems here.
Diffstat (limited to 'ext/simplexml')
-rw-r--r--ext/simplexml/simplexml.c10
1 files changed, 9 insertions, 1 deletions
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)