rrichards Tue Nov 22 21:54:10 2005 EDT
Modified files:
/php-src/ext/libxml libxml.c php_libxml.h
Log:
move document property struct from xml_common.h
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.39&r2=1.40&ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.39 php-src/ext/libxml/libxml.c:1.40
--- php-src/ext/libxml/libxml.c:1.39 Thu Nov 17 16:57:30 2005
+++ php-src/ext/libxml/libxml.c Tue Nov 22 21:54:10 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: libxml.c,v 1.39 2005/11/17 21:57:30 rasmus Exp $ */
+/* $Id: libxml.c,v 1.40 2005/11/23 02:54:10 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -952,6 +952,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/diff.php/php-src/ext/libxml/php_libxml.h?r1=1.16&r2=1.17&ty=u
Index: php-src/ext/libxml/php_libxml.h
diff -u php-src/ext/libxml/php_libxml.h:1.16
php-src/ext/libxml/php_libxml.h:1.17
--- php-src/ext/libxml/php_libxml.h:1.16 Thu Sep 8 06:33:57 2005
+++ php-src/ext/libxml/php_libxml.h Tue Nov 22 21:54:10 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_libxml.h,v 1.16 2005/09/08 10:33:57 rrichards Exp $ */
+/* $Id: php_libxml.h,v 1.17 2005/11/23 02:54:10 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
