]> granicus.if.org Git - php/commitdiff
move document property struct from xml_common.h
authorRob Richards <rrichards@php.net>
Wed, 23 Nov 2005 02:54:10 +0000 (02:54 +0000)
committerRob Richards <rrichards@php.net>
Wed, 23 Nov 2005 02:54:10 +0000 (02:54 +0000)
ext/libxml/libxml.c
ext/libxml/php_libxml.h

index adb48bd7a5e87b08e7be20b7044acd71ac35f3c3..0ac351d9979cee3274bed68b776cb9616b11d3b8 100644 (file)
@@ -952,6 +952,10 @@ int php_libxml_decrement_doc_ref(php_libxml_node_object *object TSRMLS_DC) {
                                xmlFreeDoc((xmlDoc *) object->document->ptr);
                        }
                        if (object->document->doc_props != NULL) {
+                               if (object->document->doc_props->classmap) {
+                                       zend_hash_destroy(object->document->doc_props->classmap);
+                                       FREE_HASHTABLE(object->document->doc_props->classmap);
+                               }
                                efree(object->document->doc_props);
                        }
                        efree(object->document);
index 584465fd37ca2bed42291e8915426dda6b0c120e..ffefff362e1932afc98b2b3d614d51badb0fadf3 100644 (file)
@@ -43,10 +43,21 @@ typedef struct {
        zend_llist *error_list;
 } php_libxml_globals;
 
+typedef struct _libxml_doc_props {
+       int formatoutput;
+       int validateonparse;
+       int resolveexternals;
+       int preservewhitespace;
+       int substituteentities;
+       int stricterror;
+       int recover;
+       HashTable *classmap;
+} libxml_doc_props;
+
 typedef struct _php_libxml_ref_obj {
        void *ptr;
        int   refcount;
-       void *doc_props;
+       libxml_doc_props *doc_props;
 } php_libxml_ref_obj;
 
 typedef struct _php_libxml_node_ptr {