cvs: php-src(PHP_4_3) /ext/domxml php_domxml.c
| From: | Rob Richards | Date: | Wed, 03 Dec 2003 12:30:05 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /ext/domxml php_domxml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-24860@lists.php.net to get a copy of this message | ||
rrichards Wed Dec 3 07:30:05 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/domxml php_domxml.c
Log:
require libxml 2.5.11 for threaded error handling
certain cases crash unlocking libxml mutex with earlier versions
Index: php-src/ext/domxml/php_domxml.c
diff -u php-src/ext/domxml/php_domxml.c:1.218.2.41 php-src/ext/domxml/php_domxml.c:1.218.2.42
--- php-src/ext/domxml/php_domxml.c:1.218.2.41 Tue Dec 2 10:09:31 2003
+++ php-src/ext/domxml/php_domxml.c Wed Dec 3 07:30:02 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.218.2.41 2003/12/02 15:09:31 rrichards Exp $ */
+/* $Id: php_domxml.c,v 1.218.2.42 2003/12/03 12:30:02 rrichards Exp $ */
/* TODO
* - Support Notation Nodes
@@ -1670,7 +1670,7 @@
REGISTER_LONG_CONSTANT("DOMXML_LOAD_COMPLETE_ATTRS",DOMXML_LOAD_COMPLETE_ATTRS, CONST_CS
| CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("DOMXML_LOAD_DONT_KEEP_BLANKS",DOMXML_LOAD_DONT_KEEP_BLANKS, CONST_CS
| CONST_PERSISTENT);
xmlSetGenericErrorFunc(xmlGenericErrorContext, (xmlGenericErrorFunc)domxml_error);
-#if (defined(LIBXML_THREAD_ENABLED) && LIBXML_VERSION >= 20510)
+#if (defined(LIBXML_THREAD_ENABLED) && LIBXML_VERSION >= 20511)
xmlThrDefSetGenericErrorFunc(xmlGenericErrorContext, (xmlGenericErrorFunc)domxml_error);
#endif
#if HAVE_DOMXSLT