From af054965320354eb72ff050b6ad3905d4942fbec Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Mon, 11 Oct 2004 23:56:27 +0000 Subject: [PATCH] fixed a bug in namespace lookup exhibited by the recent namespace tests in * libxslt/namespaces.c: fixed a bug in namespace lookup exhibited by the recent namespace tests in libxml2 Daniel --- ChangeLog | 5 +++++ libxslt/namespaces.c | 3 +++ libxslt/xsltwin32config.h | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ffa0205..b1ed2e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Oct 12 03:54:44 CEST 2004 Daniel Veillard + + * libxslt/namespaces.c: fixed a bug in namespace lookup exhibited + by the recent namespace tests in libxml2 + Thu Oct 7 16:15:15 CEST 2004 Daniel Veillard * libxslt/transform.c: fixed a problem of tree structure raised diff --git a/libxslt/namespaces.c b/libxslt/namespaces.c index d54edf7..3f55b96 100644 --- a/libxslt/namespaces.c +++ b/libxslt/namespaces.c @@ -437,6 +437,9 @@ xsltGetNamespace(xsltTransformContextPtr ctxt, xmlNodePtr cur, xmlNsPtr ns, * do a standard namespace search for ns in the output doc */ ret = xmlSearchNs(out->doc, out, ns->prefix); + if ((ret != NULL) && (!xmlStrEqual(ret->href, URI))) + ret = NULL; + /* * if the search fails and it's not for the default prefix * do a search by href diff --git a/libxslt/xsltwin32config.h b/libxslt/xsltwin32config.h index c468a9d..b7105da 100644 --- a/libxslt/xsltwin32config.h +++ b/libxslt/xsltwin32config.h @@ -44,7 +44,7 @@ extern "C" { * * extra version information, used to show a CVS compilation */ -#define LIBXML_VERSION_EXTRA "-CVS954" +#define LIBXML_VERSION_EXTRA "-CVS956" /** * WITH_XSLT_DEBUG: -- 2.7.4