regenerated might fix includes problems with the Ipv6 support on solaris
* NEWS doc/*: regenerated
* nanoftp.c nanohttp.c: might fix includes problems with the
Ipv6 support on solaris
* tree.c: patch from Markus Keim about xmlHasNsProp() on attributes
defined as #IMPLIED
Daniel
diff --git a/tree.c b/tree.c
index 826c37f..c38d0b5 100644
--- a/tree.c
+++ b/tree.c
@@ -5560,7 +5560,9 @@
attrDecl = xmlGetDtdAttrDesc(doc->intSubset, node->name, name);
if ((attrDecl == NULL) && (doc->extSubset != NULL))
attrDecl = xmlGetDtdAttrDesc(doc->extSubset, node->name, name);
- if (attrDecl != NULL)
+ if ((attrDecl != NULL) && (attrDecl->defaultValue != NULL))
+ /* return attribute declaration only if a default value is given
+ (that includes #FIXED declarations) */
return((xmlAttrPtr) attrDecl);
}
}
@@ -5701,7 +5703,9 @@
attrDecl = xmlGetDtdAttrDesc(doc->intSubset, node->name, name);
if ((attrDecl == NULL) && (doc->extSubset != NULL))
attrDecl = xmlGetDtdAttrDesc(doc->extSubset, node->name, name);
- if (attrDecl != NULL)
+ if ((attrDecl != NULL) && (attrDecl->defaultValue != NULL))
+ /* return attribute declaration only if a default value is given
+ (that includes #FIXED declarations) */
return(xmlStrdup(attrDecl->defaultValue));
}
}
@@ -5756,7 +5760,9 @@
attrDecl = xmlGetDtdAttrDesc(doc->intSubset, node->name, name);
if ((attrDecl == NULL) && (doc->extSubset != NULL))
attrDecl = xmlGetDtdAttrDesc(doc->extSubset, node->name, name);
- if (attrDecl != NULL)
+ if ((attrDecl != NULL) && (attrDecl->defaultValue != NULL))
+ /* return attribute declaration only if a default value is given
+ (that includes #FIXED declarations) */
return(xmlStrdup(attrDecl->defaultValue));
}
}