diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2009-07-22 16:33:56 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2009-07-22 16:33:56 +0400 |
| commit | 62f25871a3d90116f423c2eb15f24298078cde18 (patch) | |
| tree | e0926f6bdae36d5d7cc0eca40c00030e0760611f /mcs/class/System.XML/System.Xml | |
| parent | fe94dfb1cf16aacd49edcf5d28d02e158d21a441 (diff) | |
2009-07-22 Atsushi Enomoto <atsushi@ximian.com>
* XmlNamespaceManager.cs : Adding prefix "xml" seems to be allowed
as long as the URI is correct. Fixed bug #514015.
* XmlNamespaceManagerTests.cs : add test for bug #514015.
svn path=/trunk/mcs/; revision=138396
Diffstat (limited to 'mcs/class/System.XML/System.Xml')
| -rw-r--r-- | mcs/class/System.XML/System.Xml/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog index 4716e54fa78..b8f0331dbb9 100644 --- a/mcs/class/System.XML/System.Xml/ChangeLog +++ b/mcs/class/System.XML/System.Xml/ChangeLog @@ -1,5 +1,10 @@ 2009-07-22 Atsushi Enomoto <atsushi@ximian.com> + * XmlNamespaceManager.cs : Adding prefix "xml" seems to be allowed + as long as the URI is correct. Fixed bug #514015. + +2009-07-22 Atsushi Enomoto <atsushi@ximian.com> + * XmlInputStream.cs : cosmetic exception type change. Patch by Hib Eris. Fixed bug #523971. diff --git a/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs b/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs index b32c0394895..3d50405f6ad 100644 --- a/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs +++ b/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs @@ -151,6 +151,9 @@ namespace System.Xml uri = nameTable.Add (uri); } + if (prefix == PrefixXml && uri == XmlnsXml) + return; + IsValidDeclaration (prefix, uri, true); if (prefix.Length == 0) |