From: Scott Cantor <cantor.2@osu.edu>
Date: Mon, 31 Aug 2009 19:15:43 +0000 (+0000)
Subject: https://issues.shibboleth.net/jira/browse/CPPOST-34
X-Git-Tag: 2.3~31
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=commitdiff_plain;h=f981de70de3d002dba3964b80ff7e9f964ba59c1

https://issues.shibboleth.net/jira/browse/CPPOST-34
---

diff --git a/saml/signature/ContentReference.cpp b/saml/signature/ContentReference.cpp
index 80f248a..ffc7708 100644
--- a/saml/signature/ContentReference.cpp
+++ b/saml/signature/ContentReference.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2009 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,8 +94,11 @@ void ContentReference::addInclusivePrefix(const XMLCh* prefix)
 
 void ContentReference::addPrefixes(const std::set<Namespace>& namespaces)
 {
-    for (set<Namespace>::const_iterator n = namespaces.begin(); n!=namespaces.end(); ++n)
-        addInclusivePrefix(n->getNamespacePrefix());
+    for (set<Namespace>::const_iterator n = namespaces.begin(); n!=namespaces.end(); ++n) {
+        // Check for xmlns:xml.
+        if (!XMLString::equals(n->getNamespacePrefix(), xmlconstants::XML_PREFIX) || !XMLString::equals(n->getNamespaceURI(), xmlconstants::XML_NS))
+            addInclusivePrefix(n->getNamespacePrefix());
+    }
 }
 
 void ContentReference::addPrefixes(const XMLObject& xmlObject)