diff options
| -rw-r--r-- | NEWS | 11 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | lasso.doap | 4 | ||||
| -rw-r--r-- | lasso/xml/xml.c | 26 | ||||
| -rw-r--r-- | website/web/doap.rdf | 4 | ||||
| -rw-r--r-- | website/web/index.xml | 6 | ||||
| -rw-r--r-- | website/web/news/20-release-2.3.6.xml | 16 |
7 files changed, 66 insertions, 5 deletions
@@ -1,6 +1,17 @@ NEWS ==== +2.3.6 - November 29th 2011 +-------------------------- + +2 commits, 2 files changed, 28 insertions, 2 deletions + + * fix a bug when receiving a signature using the InclusiveNamespaces + PrefixList by copying namespace declaration from upper level at the level of + the signed node. + * fix compilation warning on recent version of GCC + + 2.3.5 - January 11th 2010 ------------------------- diff --git a/configure.ac b/configure.ac index 054f88b0..e616958c 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ dnl - Second number is the number of supported API versions where API version > dnl first number. dnl - Third number is the current API version implementation version number. dnl See libtool explanations about current, age and release, later in this file. -AC_INIT([lasso], 2.3.5, lasso-devel@lists.labs.libre-entreprise.org) +AC_INIT([lasso], 2.3.6, lasso-devel@lists.labs.libre-entreprise.org) dnl Check if autoconf ver > 2.53 AC_PREREQ(2.53) AC_CONFIG_MACRO_DIR([m4]) @@ -184,7 +184,7 @@ dnl - interfaces removed -> AGE = 0 # m = a # r = r current=`expr $VERSION_MAJOR + $VERSION_MINOR` -LASSO_VERSION_INFO="12:3:9" +LASSO_VERSION_INFO="12:4:9" AC_SUBST(LASSO_VERSION_INFO) dnl Compute the minimal supported ABI version for Win32 scripts and resources files. @@ -62,6 +62,10 @@ </repository> <release> <Version> + <created>2011-11-29</created> + <revision>2.3.6</revision> + </Version> + <Version> <created>2011-01-05</created> <revision>2.3.5</revision> </Version> diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c index 13480f33..465a6992 100644 --- a/lasso/xml/xml.c +++ b/lasso/xml/xml.c @@ -843,8 +843,34 @@ lasso_node_set_original_xmlnode(LassoNode *node, xmlNode* xmlnode) { if (xmlnode) { xmlNode *copy = NULL; + xmlNode *parent = xmlnode->parent; copy = xmlCopyNode(xmlnode, 1); + /* excl-c14n can move some namespace declarations at the point where the document is + * cut, to simulate it we copy on the new node all namespaces from the parents of + * the node which are not shadowed by another declaration on this node or one of its + * parent. */ + while (parent && parent->type == XML_ELEMENT_NODE) { + xmlNs *ns_def = parent->nsDef; + xmlNs *local_ns_def; + while (ns_def) { + int ok = 1; + local_ns_def = copy->nsDef; + while (local_ns_def) { + if (lasso_strisequal((char*)local_ns_def->prefix, (char*)ns_def->prefix)) { + ok = 0; + break; + } + local_ns_def = local_ns_def->next; + } + if (ok) { + xmlNewNs(copy, ns_def->href, ns_def->prefix); + } + ns_def = ns_def->next; + } + parent = parent->parent; + } + if (lasso_flag_memory_debug) { fprintf(stderr, "setting original xmlnode (at %p) on node %s:%p\n", copy, G_OBJECT_TYPE_NAME (node), node); } diff --git a/website/web/doap.rdf b/website/web/doap.rdf index 0c04773b..a613896c 100644 --- a/website/web/doap.rdf +++ b/website/web/doap.rdf @@ -62,6 +62,10 @@ </repository> <release> <Version> + <created>2011-11-29</created> + <revision>2.3.6</revision> + </Version> + <Version> <created>2011-01-05</created> <revision>2.3.5</revision> </Version> diff --git a/website/web/index.xml b/website/web/index.xml index b49ea76b..73059b9c 100644 --- a/website/web/index.xml +++ b/website/web/index.xml @@ -46,9 +46,9 @@ </p> <p> - The most recent version of Lasso is <strong>2.3.5</strong>. You can - <a href="https://dev.entrouvert.org/lasso/lasso-2.3.5.tar.gz">download - the 2.3.5 tarball here</a> or get more options on the general <a + The most recent version of Lasso is <strong>2.3.6</strong>. You can + <a href="https://dev.entrouvert.org/lasso/lasso-2.3.6.tar.gz">download + the 2.3.6 tarball here</a> or get more options on the general <a href="/download/">download</a> page. </p> diff --git a/website/web/news/20-release-2.3.6.xml b/website/web/news/20-release-2.3.6.xml new file mode 100644 index 00000000..ff6e4687 --- /dev/null +++ b/website/web/news/20-release-2.3.6.xml @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<div xmlns="http://www.w3.org/1999/xhtml"> +<h3>2011-11-29: Released 2.3.6</h3> + + <p> + Lasso 2.3.6 have been released. + <a href="https://dev.entrouvert.org/lasso/lasso-2.3.6.tar.gz">Download 2.3.6 now</a> + </p> + + <p class="changes"> + <strong>What changed ?</strong> + A bug concerning signature using the InclusiveNamespace parameter of + exclusive XML canonicalization was fixed. + </p> + +</div> |