Removed duplicate php_libxml_(init|shutdown) they are already done by

ext/libxml.

diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index f2f80ae75936b6b6506f61f578eb5120e730d5a3..44e56a557e99b75b6f2e67c6c36b3d2044858ab4 100644 (file)
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -631,8 +631,6 @@ PHP_MINIT_FUNCTION(dom)
        REGISTER_LONG_CONSTANT("DOM_INVALID_ACCESS_ERR",        INVALID_ACCESS_ERR,             CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("DOM_VALIDATION_ERR",            VALIDATION_ERR,                 CONST_CS | CONST_PERSISTENT);
 
-       php_libxml_initialize();
-
        return SUCCESS;
 }
 /* }}} */
@@ -663,8 +661,6 @@ PHP_MINFO_FUNCTION(dom)
 
 PHP_MSHUTDOWN_FUNCTION(dom)
 {
-       php_libxml_shutdown();
-
        zend_hash_destroy(&dom_domstringlist_prop_handlers);
        zend_hash_destroy(&dom_namelist_prop_handlers);
        zend_hash_destroy(&dom_domimplementationlist_prop_handlers);

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 986f8c3f149434deb98cd22824f5e4ec5bb2951a..b753edc9c52b51b661a48dcb3a8c0418eb3d9e8b 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1533,8 +1533,6 @@ PHP_MINIT_FUNCTION(simplexml)
        sxe_object_handlers.get_class_entry = zend_get_std_object_handlers()->get_class_entry;
        sxe_object_handlers.get_class_name = zend_get_std_object_handlers()->get_class_name;
 
-       php_libxml_initialize();
-
        return SUCCESS;
 }
 /* }}} */
@@ -1543,8 +1541,6 @@ PHP_MINIT_FUNCTION(simplexml)
  */
 PHP_MSHUTDOWN_FUNCTION(simplexml)
 {
-       php_libxml_shutdown();
-
        return SUCCESS;
 }
 /* }}} */

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 8b3306dd573bc65a40ce1755ffe801c938aecd84..3a17f31b005f80856e94646481f487bc042a132c 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -247,10 +247,7 @@ PHP_MINIT_FUNCTION(xml)
 #else
        REGISTER_STRING_CONSTANT("XML_SAX_IMPL", "expat", CONST_CS|CONST_PERSISTENT);
 #endif
-       
-#ifdef LIBXML_EXPAT_COMPAT
-       php_libxml_initialize();
-#endif
+
        return SUCCESS;
 }
 
@@ -263,9 +260,6 @@ PHP_RINIT_FUNCTION(xml)
 
 PHP_MSHUTDOWN_FUNCTION(xml)
 {
-#ifdef LIBXML_EXPAT_COMPAT
-       php_libxml_shutdown();
-#endif
        return SUCCESS;
 }