fixing namespace DTD validations the output of defaulted namespaces is
* SAX2.c: fixing namespace DTD validations
* result/valid/ns2.xml result/valid/ns.xml: the output of defaulted
namespaces is slightly different now.
* Makefile.am: report the memory used in Timingtests (as well as time)
Daniel
diff --git a/SAX2.c b/SAX2.c
index 82bc4a7..d0c1854 100644
--- a/SAX2.c
+++ b/SAX2.c
@@ -1922,6 +1922,10 @@
return;
}
}
+ if (ctxt->linenumbers) {
+ if (ctxt->input != NULL)
+ ret->content = (void *) (long) ctxt->input->line;
+ }
if (ctxt->myDoc->children == NULL) {
xmlAddChild((xmlNodePtr) ctxt->myDoc, (xmlNodePtr) ret);
@@ -1950,12 +1954,13 @@
ctxt->disableSAX = 1;
return;
}
+ if ((!ctxt->html) && ctxt->validate && ctxt->wellFormed &&
+ ctxt->myDoc && ctxt->myDoc->intSubset) {
+ ctxt->valid &= xmlValidateOneNamespace(&ctxt->vctxt, ctxt->myDoc,
+ ret, prefix, ns, uri);
+ }
}
ctxt->nodemem = -1;
- if (ctxt->linenumbers) {
- if (ctxt->input != NULL)
- ret->content = (void *) (long) ctxt->input->line;
- }
/*
* We are parsing a new node.