rrichards Mon Dec 1 11:19:18 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/domxml php_domxml.c
Log:
Fix bug #26443: No errror reporting for Errors in the domxml extension
Index: php-src/ext/domxml/php_domxml.c
diff -u php-src/ext/domxml/php_domxml.c:1.218.2.39
php-src/ext/domxml/php_domxml.c:1.218.2.40
--- php-src/ext/domxml/php_domxml.c:1.218.2.39 Fri Nov 28 19:43:37 2003
+++ php-src/ext/domxml/php_domxml.c Mon Dec 1 11:19:15 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.218.2.39 2003/11/29 00:43:37 chregu Exp $ */
+/* $Id: php_domxml.c,v 1.218.2.40 2003/12/01 16:19:15 rrichards Exp $ */
/* TODO
* - Support Notation Nodes
@@ -4015,18 +4015,18 @@
ctxt->loadsubset = resolve_externals;
ctxt->replaceEntities = substitute_ent;
- if (data != NULL) {
- ctxt->_private = data;
- errorCtxt.valid = &ctxt->vctxt;
- errorCtxt.errors = data;
- errorCtxt.parser = ctxt;
-
- ctxt->sax->error = domxml_error_ext;
- ctxt->sax->warning = domxml_error_ext;
- ctxt->vctxt.userData= (void *) &errorCtxt;
- ctxt->vctxt.error = (xmlValidityErrorFunc) domxml_error_validate;
- ctxt->vctxt.warning = (xmlValidityWarningFunc) domxml_error_validate;
- }
+ /* Always set error handling as threaded libxml doesnt pick up the global
handling
+ set by xmlSetGenericErrorFunc for child threads */
+ ctxt->_private = data;
+ errorCtxt.valid = &ctxt->vctxt;
+ errorCtxt.errors = data;
+ errorCtxt.parser = ctxt;
+
+ ctxt->sax->error = domxml_error_ext;
+ ctxt->sax->warning = domxml_error_ext;
+ ctxt->vctxt.userData= (void *) &errorCtxt;
+ ctxt->vctxt.error = (xmlValidityErrorFunc) domxml_error_validate;
+ ctxt->vctxt.warning = (xmlValidityWarningFunc) domxml_error_validate;
xmlParseDocument(ctxt);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
