rrichards Mon May 22 17:09:05 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/libxml libxml.c php_libxml.h
Log:
MFH: move document property struct from xml_common.h
http://cvs.php.net/viewcvs.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7&r2=1.32.2.7.2.1&diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.7
php-src/ext/libxml/libxml.c:1.32.2.7.2.1
--- php-src/ext/libxml/libxml.c:1.32.2.7 Sun Jan 1 12:50:08 2006
+++ php-src/ext/libxml/libxml.c Mon May 22 17:09:05 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: libxml.c,v 1.32.2.7 2006/01/01 12:50:08 sniper Exp $ */
+/* $Id: libxml.c,v 1.32.2.7.2.1 2006/05/22 17:09:05 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -942,6 +942,10 @@
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);
http://cvs.php.net/viewcvs.cgi/php-src/ext/libxml/php_libxml.h?r1=1.15.2.2&r2=1.15.2.2.2.1&diff_format=u
Index: php-src/ext/libxml/php_libxml.h
diff -u php-src/ext/libxml/php_libxml.h:1.15.2.2
php-src/ext/libxml/php_libxml.h:1.15.2.2.2.1
--- php-src/ext/libxml/php_libxml.h:1.15.2.2 Sun Jan 1 12:50:08 2006
+++ php-src/ext/libxml/php_libxml.h Mon May 22 17:09:05 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_libxml.h,v 1.15.2.2 2006/01/01 12:50:08 sniper Exp $ */
+/* $Id: php_libxml.h,v 1.15.2.2.2.1 2006/05/22 17:09:05 rrichards Exp $ */
#ifndef PHP_LIBXML_H
#define PHP_LIBXML_H
@@ -43,10 +43,21 @@
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 {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
